295 files changed, 93152 insertions, 25123 deletions

diff --git a/mysql-test/suite/perfschema/r/all_tests.result b/mysql-test/suite/perfschema/r/all_tests.result
index 3f413ca9a1e..6b343d9d801 100644
--- a/mysql-test/suite/perfschema/r/all_tests.result
+++ b/mysql-test/suite/perfschema/r/all_tests.result
@@ -10,10 +10,13 @@ where table_schema='performance_schema';
 update t2 set test_name= replace(test_name, "events_waits_summary_", "ews_");
 update t2 set test_name= replace(test_name, "events_stages_summary_", "esgs_");
 update t2 set test_name= replace(test_name, "events_statements_summary_", "esms_");
+update t2 set test_name= replace(test_name, "events_transactions_summary_", "ets_");
 update t2 set test_name= replace(test_name, "file_summary_", "fs_");
 update t2 set test_name= replace(test_name, "objects_summary_", "os_");
 update t2 set test_name= replace(test_name, "table_io_waits_summary_", "tiws_");
 update t2 set test_name= replace(test_name, "table_lock_waits_summary_", "tlws_");
+update t2 set test_name= replace(test_name, "memory_summary_", "mems_");
+update t2 set test_name= replace(test_name, "user_variables_", "uvar_");
 delete from t2 where t2.test_name in (select t1.test_name from t1);
 select test_name as `MISSING DDL/DML TESTS` from t2;
 MISSING DDL/DML TESTS
diff --git a/mysql-test/suite/perfschema/r/alter_table_progress.result b/mysql-test/suite/perfschema/r/alter_table_progress.result
new file mode 100644
index 00000000000..96516993a5c
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/alter_table_progress.result
@@ -0,0 +1,100 @@
+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);
+EVENT_NAME	WORK_COMPLETED	WORK_ESTIMATED
+stage/sql/copy to tmp table	0	5
+SET DEBUG_SYNC='now SIGNAL wait_row';
+SET DEBUG_SYNC='now WAIT_FOR found_row';
+select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
+from performance_schema.events_stages_current
+where (thread_id = @con1_thread_id);
+EVENT_NAME	WORK_COMPLETED	WORK_ESTIMATED
+stage/sql/copy to tmp table	1	5
+SET DEBUG_SYNC='now SIGNAL wait_row';
+SET DEBUG_SYNC='now WAIT_FOR found_row';
+select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
+from performance_schema.events_stages_current
+where (thread_id = @con1_thread_id);
+EVENT_NAME	WORK_COMPLETED	WORK_ESTIMATED
+stage/sql/copy to tmp table	2	5
+SET DEBUG_SYNC='now SIGNAL wait_row';
+SET DEBUG_SYNC='now WAIT_FOR found_row';
+select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
+from performance_schema.events_stages_current
+where (thread_id = @con1_thread_id);
+EVENT_NAME	WORK_COMPLETED	WORK_ESTIMATED
+stage/sql/copy to tmp table	3	5
+SET DEBUG_SYNC='now SIGNAL wait_row';
+SET DEBUG_SYNC='now WAIT_FOR found_row';
+select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
+from performance_schema.events_stages_current
+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
+where (thread_id = @con1_thread_id)
+and (nesting_event_id = @con1_stmt_id)
+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/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/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/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
new file mode 100644
index 00000000000..b14dad9600e
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/bad_option.result
@@ -0,0 +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/bad_option_1.result b/mysql-test/suite/perfschema/r/bad_option_1.result
deleted file mode 100644
index 05ff5663882..00000000000
--- a/mysql-test/suite/perfschema/r/bad_option_1.result
+++ /dev/null
@@ -1,4 +0,0 @@
-# Kill the server
-Found: unknown variable 'performance-schema-enabled=maybe'
-Found: Aborting
-# restart
diff --git a/mysql-test/suite/perfschema/r/bad_option_2.result b/mysql-test/suite/perfschema/r/bad_option_2.result
deleted file mode 100644
index c2809525827..00000000000
--- a/mysql-test/suite/perfschema/r/bad_option_2.result
+++ /dev/null
@@ -1,3 +0,0 @@
-# Kill the server
-FOUND 1 /ambiguous option '--performance-schema-max_=12'/ in bad_option_2.txt
-# restart
diff --git a/mysql-test/suite/perfschema/r/bad_option_3.result b/mysql-test/suite/perfschema/r/bad_option_3.result
deleted file mode 100644
index 1981f0b2044..00000000000
--- a/mysql-test/suite/perfschema/r/bad_option_3.result
+++ /dev/null
@@ -1,4 +0,0 @@
-# Kill the server
-Found: unknown option '-x'
-Found: Aborting
-# restart
diff --git a/mysql-test/suite/perfschema/r/bad_option_4.result b/mysql-test/suite/perfschema/r/bad_option_4.result
deleted file mode 100644
index 1d50a80be3d..00000000000
--- a/mysql-test/suite/perfschema/r/bad_option_4.result
+++ /dev/null
@@ -1,4 +0,0 @@
-# Kill the server
-Found: Can't change dir to.*bad_option_h_param
-Found: Aborting
-# restart
diff --git a/mysql-test/suite/perfschema/r/bad_option_5.result b/mysql-test/suite/perfschema/r/bad_option_5.result
deleted file mode 100644
index 840717023ac..00000000000
--- a/mysql-test/suite/perfschema/r/bad_option_5.result
+++ /dev/null
@@ -1,4 +0,0 @@
-# Kill the server
-Found: unknown option '-X'
-Found: Aborting
-# restart
diff --git a/mysql-test/suite/perfschema/r/batch_table_io_func.result b/mysql-test/suite/perfschema/r/batch_table_io_func.result
new file mode 100644
index 00000000000..212c08c7e90
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/batch_table_io_func.result
@@ -0,0 +1,195 @@
+UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
+UPDATE performance_schema.setup_instruments SET enabled = 'YES'
+WHERE name in ('wait/io/table/sql/handler',
+'wait/lock/table/sql/handler');
+drop procedure if exists before_payload;
+drop procedure if exists after_payload;
+create procedure before_payload()
+begin
+TRUNCATE TABLE performance_schema.table_io_waits_summary_by_index_usage;
+TRUNCATE TABLE performance_schema.table_io_waits_summary_by_table;
+TRUNCATE TABLE performance_schema.events_waits_history_long;
+TRUNCATE TABLE performance_schema.events_waits_history;
+TRUNCATE TABLE performance_schema.events_waits_current;
+end
+$$
+create procedure after_payload()
+begin
+select count(1) as number_seen,
+OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME,
+OPERATION, NUMBER_OF_BYTES
+from performance_schema.events_waits_history_long
+where OBJECT_SCHEMA = "test"
+    group by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME, OPERATION, NUMBER_OF_BYTES;
+select OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME,
+COUNT_STAR, COUNT_READ, COUNT_WRITE
+from performance_schema.table_io_waits_summary_by_index_usage
+where OBJECT_SCHEMA = "test"
+    order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME;
+select OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME,
+COUNT_STAR, COUNT_READ, COUNT_WRITE
+from performance_schema.table_io_waits_summary_by_table
+where OBJECT_SCHEMA = "test"
+    order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
+end
+$$
+drop table if exists t1;
+drop table if exists t2;
+drop table if exists t3;
+create table t0(v int);
+create table t1(id1 int, a int);
+create table t2(id1 int, id2 int, b int);
+create table t3(id2 int, id3 int, c int);
+insert into t0 values
+(0), (1), (2), (3), (4),
+(5), (6), (7), (8), (9);
+insert into t1(id1, a)
+select v, 100*v from t0;
+insert into t2(id1, id2, b)
+select X.v, 10*X.v + Y.v, 100*X.v + 10*Y.v
+from t0 X, t0 Y;
+insert into t3(id2, id3, c)
+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
+0	0
+1	100
+2	200
+3	300
+4	400
+5	500
+6	600
+7	700
+8	800
+9	900
+select * from t2
+where (b >= 180) and (b <= 220)
+order by b;
+id1	id2	b
+1	18	180
+1	19	190
+2	20	200
+2	21	210
+2	22	220
+select * from t3
+where (c >= 587) and (c <= 612)
+order by c;
+id2	id3	c
+58	587	587
+58	588	588
+58	589	589
+59	590	590
+59	591	591
+59	592	592
+59	593	593
+59	594	594
+59	595	595
+59	596	596
+59	597	597
+59	598	598
+59	599	599
+60	600	600
+60	601	601
+60	602	602
+60	603	603
+60	604	604
+60	605	605
+60	606	606
+60	607	607
+60	608	608
+60	609	609
+61	610	610
+61	611	611
+61	612	612
+explain extended select t1.*, t2.*, t3.*
+from t1 join t2 using (id1) join t3 using (id2);
+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 `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);
+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
+TABLE	test	t2	NULL	101	101	0
+TABLE	test	t3	NULL	1000	1000	0
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
+TABLE	test	t0	0	0	0
+TABLE	test	t1	11	11	0
+TABLE	test	t2	101	101	0
+TABLE	test	t3	1000	1000	0
+alter table t1 add unique index(id1);
+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 extended select t1.*, t2.*, t3.*
+from t1 join t2 using (id1) join t3 using (id2);
+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 `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);
+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
+TABLE	test	t1	id1	0	0	0
+TABLE	test	t2	id1	110	110	0
+TABLE	test	t2	id2	0	0	0
+TABLE	test	t3	id2	1000	1000	0
+TABLE	test	t3	id3	0	0	0
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
+TABLE	test	t0	0	0	0
+TABLE	test	t1	11	11	0
+TABLE	test	t2	110	110	0
+TABLE	test	t3	1000	1000	0
+drop table t0;
+drop table t1;
+drop table t2;
+drop table t3;
+drop procedure before_payload;
+drop procedure after_payload;
+UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
diff --git a/mysql-test/suite/perfschema/r/binlog_edge_mix.result b/mysql-test/suite/perfschema/r/binlog_edge_mix.result
index b9673e74855..e4b95cb69ff 100644
--- a/mysql-test/suite/perfschema/r/binlog_edge_mix.result
+++ b/mysql-test/suite/perfschema/r/binlog_edge_mix.result
@@ -84,19 +84,19 @@ Warnings:
 Note	1051	Unknown table 'test.marker_multi_delete'
 use my_replicated_db;
 insert into performance_schema.setup_actors
-values ('FOO', 'FOO', 'FOO');
+values ('FOO', 'FOO', 'FOO', 'YES', 'YES');
 delete my_tx_table.*, performance_schema.setup_actors.*
 from my_tx_table, performance_schema.setup_actors
 where my_tx_table.a != 1000
 or performance_schema.setup_actors.role='FOO';
 insert into performance_schema.setup_actors
-values ('BAR', 'BAR', 'BAR');
+values ('BAR', 'BAR', 'BAR', 'YES', 'YES');
 delete my_non_tx_table.*, performance_schema.setup_actors.*
 from my_non_tx_table, performance_schema.setup_actors
 where my_non_tx_table.a != 1000
 or performance_schema.setup_actors.role='BAR';
 insert into performance_schema.setup_actors
-values ('BAZ', 'BAZ', 'BAZ');
+values ('BAZ', 'BAZ', 'BAZ', 'YES', 'YES');
 delete my_bh_table.*, performance_schema.setup_actors.*
 from my_bh_table, performance_schema.setup_actors
 where my_bh_table.a != 1000
@@ -175,4 +175,4 @@ master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `marker_end` /* generated by server */
 master-bin.000001	#	Query	#	#	drop database my_replicated_db
 truncate table performance_schema.setup_actors;
-insert into performance_schema.setup_actors values ('%', '%', '%');
+insert into performance_schema.setup_actors values ('%', '%', '%', 'YES', 'YES');
diff --git a/mysql-test/suite/perfschema/r/binlog_edge_row.result b/mysql-test/suite/perfschema/r/binlog_edge_row.result
index 40595a804f7..52296de4bb9 100644
--- a/mysql-test/suite/perfschema/r/binlog_edge_row.result
+++ b/mysql-test/suite/perfschema/r/binlog_edge_row.result
@@ -86,19 +86,19 @@ Warnings:
 Note	1051	Unknown table 'test.marker_multi_delete'
 use my_replicated_db;
 insert into performance_schema.setup_actors
-values ('FOO', 'FOO', 'FOO');
+values ('FOO', 'FOO', 'FOO', 'YES', 'YES');
 delete my_tx_table.*, performance_schema.setup_actors.*
 from my_tx_table, performance_schema.setup_actors
 where my_tx_table.a != 1000
 or performance_schema.setup_actors.role='FOO';
 insert into performance_schema.setup_actors
-values ('BAR', 'BAR', 'BAR');
+values ('BAR', 'BAR', 'BAR', 'YES', 'YES');
 delete my_non_tx_table.*, performance_schema.setup_actors.*
 from my_non_tx_table, performance_schema.setup_actors
 where my_non_tx_table.a != 1000
 or performance_schema.setup_actors.role='BAR';
 insert into performance_schema.setup_actors
-values ('BAZ', 'BAZ', 'BAZ');
+values ('BAZ', 'BAZ', 'BAZ', 'YES', 'YES');
 delete my_bh_table.*, performance_schema.setup_actors.*
 from my_bh_table, performance_schema.setup_actors
 where my_bh_table.a != 1000
@@ -180,4 +180,4 @@ master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `marker_end` /* generated by server */
 master-bin.000001	#	Query	#	#	drop database my_replicated_db
 truncate table performance_schema.setup_actors;
-insert into performance_schema.setup_actors values ('%', '%', '%');
+insert into performance_schema.setup_actors values ('%', '%', '%', 'YES', 'YES');
diff --git a/mysql-test/suite/perfschema/r/binlog_edge_stmt.result b/mysql-test/suite/perfschema/r/binlog_edge_stmt.result
index fdbf34b07a2..2a09614179f 100644
--- a/mysql-test/suite/perfschema/r/binlog_edge_stmt.result
+++ b/mysql-test/suite/perfschema/r/binlog_edge_stmt.result
@@ -120,19 +120,19 @@ Warnings:
 Note	1051	Unknown table 'test.marker_multi_delete'
 use my_replicated_db;
 insert into performance_schema.setup_actors
-values ('FOO', 'FOO', 'FOO');
+values ('FOO', 'FOO', 'FOO', 'YES', 'YES');
 delete my_tx_table.*, performance_schema.setup_actors.*
 from my_tx_table, performance_schema.setup_actors
 where my_tx_table.a != 1000
 or performance_schema.setup_actors.role='FOO';
 insert into performance_schema.setup_actors
-values ('BAR', 'BAR', 'BAR');
+values ('BAR', 'BAR', 'BAR', 'YES', 'YES');
 delete my_non_tx_table.*, performance_schema.setup_actors.*
 from my_non_tx_table, performance_schema.setup_actors
 where my_non_tx_table.a != 1000
 or performance_schema.setup_actors.role='BAR';
 insert into performance_schema.setup_actors
-values ('BAZ', 'BAZ', 'BAZ');
+values ('BAZ', 'BAZ', 'BAZ', 'YES', 'YES');
 delete my_bh_table.*, performance_schema.setup_actors.*
 from my_bh_table, performance_schema.setup_actors
 where my_bh_table.a != 1000
@@ -255,4 +255,4 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `marker_multi_del
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `marker_end` /* generated by server */
 master-bin.000001	#	Query	#	#	drop database my_replicated_db
 truncate table performance_schema.setup_actors;
-insert into performance_schema.setup_actors values ('%', '%', '%');
+insert into performance_schema.setup_actors values ('%', '%', '%', 'YES', 'YES');
diff --git a/mysql-test/suite/perfschema/r/binlog_ok_mix.result b/mysql-test/suite/perfschema/r/binlog_ok_mix.result
index 3e6237e1256..cc2c08baa8d 100644
--- a/mysql-test/suite/perfschema/r/binlog_ok_mix.result
+++ b/mysql-test/suite/perfschema/r/binlog_ok_mix.result
@@ -43,10 +43,10 @@ values ('XXX', 'XXX', 'XXX'),
 ('ZZZ', 'ZZZ', 'ZZZ');
 select * from performance_schema.setup_actors
 where user in ('XXX', 'YYY', 'ZZZ') order by user;
-HOST	USER	ROLE
-XXX	XXX	XXX
-YYY	YYY	YYY
-ZZZ	ZZZ	ZZZ
+HOST	USER	ROLE	ENABLED	HISTORY
+XXX	XXX	XXX	YES	YES
+YYY	YYY	YYY	YES	YES
+ZZZ	ZZZ	ZZZ	YES	YES
 insert into performance_schema.setup_objects
 (object_type, object_schema, object_name, enabled, timed)
 values ('TABLE', 'DB1', 'AAA', 'YES', 'YES'),
diff --git a/mysql-test/suite/perfschema/r/binlog_ok_row.result b/mysql-test/suite/perfschema/r/binlog_ok_row.result
index 5cf9062138c..0beea6ae878 100644
--- a/mysql-test/suite/perfschema/r/binlog_ok_row.result
+++ b/mysql-test/suite/perfschema/r/binlog_ok_row.result
@@ -43,10 +43,10 @@ values ('XXX', 'XXX', 'XXX'),
 ('ZZZ', 'ZZZ', 'ZZZ');
 select * from performance_schema.setup_actors
 where user in ('XXX', 'YYY', 'ZZZ') order by user;
-HOST	USER	ROLE
-XXX	XXX	XXX
-YYY	YYY	YYY
-ZZZ	ZZZ	ZZZ
+HOST	USER	ROLE	ENABLED	HISTORY
+XXX	XXX	XXX	YES	YES
+YYY	YYY	YYY	YES	YES
+ZZZ	ZZZ	ZZZ	YES	YES
 insert into performance_schema.setup_objects
 (object_type, object_schema, object_name, enabled, timed)
 values ('TABLE', 'DB1', 'AAA', 'YES', 'YES'),
diff --git a/mysql-test/suite/perfschema/r/binlog_ok_stmt.result b/mysql-test/suite/perfschema/r/binlog_ok_stmt.result
index fe71c3024d1..9fd9af6c383 100644
--- a/mysql-test/suite/perfschema/r/binlog_ok_stmt.result
+++ b/mysql-test/suite/perfschema/r/binlog_ok_stmt.result
@@ -43,10 +43,10 @@ values ('XXX', 'XXX', 'XXX'),
 ('ZZZ', 'ZZZ', 'ZZZ');
 select * from performance_schema.setup_actors
 where user in ('XXX', 'YYY', 'ZZZ') order by user;
-HOST	USER	ROLE
-XXX	XXX	XXX
-YYY	YYY	YYY
-ZZZ	ZZZ	ZZZ
+HOST	USER	ROLE	ENABLED	HISTORY
+XXX	XXX	XXX	YES	YES
+YYY	YYY	YYY	YES	YES
+ZZZ	ZZZ	ZZZ	YES	YES
 insert into performance_schema.setup_objects
 (object_type, object_schema, object_name, enabled, timed)
 values ('TABLE', 'DB1', 'AAA', 'YES', 'YES'),
diff --git a/mysql-test/suite/perfschema/r/checksum.result b/mysql-test/suite/perfschema/r/checksum.result
index f2a0f5a7713..1ed6e70e6de 100644
--- a/mysql-test/suite/perfschema/r/checksum.result
+++ b/mysql-test/suite/perfschema/r/checksum.result
@@ -16,6 +16,14 @@ checksum table performance_schema.events_statements_summary_by_host_by_event_nam
 checksum table performance_schema.events_statements_summary_by_thread_by_event_name;
 checksum table performance_schema.events_statements_summary_by_user_by_event_name;
 checksum table performance_schema.events_statements_summary_global_by_event_name;
+checksum table performance_schema.events_transactions_current;
+checksum table performance_schema.events_transactions_history;
+checksum table performance_schema.events_transactions_history_long;
+checksum table performance_schema.events_transactions_summary_by_account_by_event_name;
+checksum table performance_schema.events_transactions_summary_by_host_by_event_name;
+checksum table performance_schema.events_transactions_summary_by_thread_by_event_name;
+checksum table performance_schema.events_transactions_summary_by_user_by_event_name;
+checksum table performance_schema.events_transactions_summary_global_by_event_name;
 checksum table performance_schema.events_waits_current;
 checksum table performance_schema.events_waits_history;
 checksum table performance_schema.events_waits_history_long;
@@ -61,6 +69,14 @@ checksum table performance_schema.events_statements_summary_by_host_by_event_nam
 checksum table performance_schema.events_statements_summary_by_thread_by_event_name extended;
 checksum table performance_schema.events_statements_summary_by_user_by_event_name extended;
 checksum table performance_schema.events_statements_summary_global_by_event_name extended;
+checksum table performance_schema.events_transactions_current extended;
+checksum table performance_schema.events_transactions_history extended;
+checksum table performance_schema.events_transactions_history_long extended;
+checksum table performance_schema.events_transactions_summary_by_account_by_event_name extended;
+checksum table performance_schema.events_transactions_summary_by_host_by_event_name extended;
+checksum table performance_schema.events_transactions_summary_by_thread_by_event_name extended;
+checksum table performance_schema.events_transactions_summary_by_user_by_event_name extended;
+checksum table performance_schema.events_transactions_summary_global_by_event_name extended;
 checksum table performance_schema.events_waits_current extended;
 checksum table performance_schema.events_waits_history extended;
 checksum table performance_schema.events_waits_history_long extended;
diff --git a/mysql-test/suite/perfschema/r/cnf_option.result b/mysql-test/suite/perfschema/r/cnf_option.result
index 85adfb5113d..c991311d136 100644
--- a/mysql-test/suite/perfschema/r/cnf_option.result
+++ b/mysql-test/suite/perfschema/r/cnf_option.result
@@ -1,6 +1,6 @@
-show variables like 'performance_schema_max_thread_classes';
+show global variables like 'performance_schema_max_thread_classes';
 Variable_name	Value
 performance_schema_max_thread_classes	12
-show variables like 'performance_schema_max_thread_instances';
+show global variables like 'performance_schema_max_thread_instances';
 Variable_name	Value
 performance_schema_max_thread_instances	318
diff --git a/mysql-test/suite/perfschema/r/connect_attrs.result b/mysql-test/suite/perfschema/r/connect_attrs.result
index 5e45a4cd900..eb83cb5e886 100644
--- a/mysql-test/suite/perfschema/r/connect_attrs.result
+++ b/mysql-test/suite/perfschema/r/connect_attrs.result
@@ -38,9 +38,11 @@ FROM performance_schema.session_connect_attrs;
 COUNT(DISTINCT PROCESSLIST_ID)
 2
 connection non_privileged_user;
+# must return 1
 SELECT COUNT(DISTINCT PROCESSLIST_ID)
 FROM performance_schema.session_account_connect_attrs;
-ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table 'session_account_connect_attrs'
+COUNT(DISTINCT PROCESSLIST_ID)
+1
 SELECT COUNT(DISTINCT PROCESSLIST_ID)
 FROM performance_schema.session_connect_attrs;
 ERROR 42000: SELECT command denied to user 'wl5924'@'localhost' for table 'session_connect_attrs'
diff --git a/mysql-test/suite/perfschema/r/connection_type_notwin.result b/mysql-test/suite/perfschema/r/connection_type_notwin.result
new file mode 100644
index 00000000000..f8b6bfd0358
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/connection_type_notwin.result
@@ -0,0 +1,82 @@
+"Default connection"
+select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+NAME	thread/sql/one_connection
+PROCESSLIST_USER	root
+PROCESSLIST_HOST	localhost
+CONNECTION_TYPE	Socket
+create user 'root'@'santa.claus.ipv4.example.com';
+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 @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;
+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
+where PROCESSLIST_ID = connection_id();
+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
+where PROCESSLIST_ID = connection_id();
+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
+where PROCESSLIST_ID = connection_id();
+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'
+     INTO TABLE test_log FIELDS TERMINATED BY '\n' LINES TERMINATED BY '\n';
+select user_host, command_type, argument from mysql.general_log
+where command_type = "Connect";
+user_host	[root] @ localhost []
+command_type	Connect
+argument	root@localhost on test using Socket
+user_host	[root] @ santa.claus.ipv4.example.com [192.0.2.4]
+command_type	Connect
+argument	root@santa.claus.ipv4.example.com on test using TCP/IP
+user_host	[rootssl] @ santa.claus.ipv4.example.com [192.0.2.4]
+command_type	Connect
+argument	rootssl@santa.claus.ipv4.example.com on test using SSL/TLS
+select substring(argument, locate("Connect", argument)) from test_log
+where argument like "%Connect%on test%";
+substring(argument, locate("Connect", argument))	Connect	root@localhost on test using Socket
+substring(argument, locate("Connect", argument))	Connect	root@santa.claus.ipv4.example.com on test using TCP/IP
+substring(argument, locate("Connect", argument))	Connect	rootssl@santa.claus.ipv4.example.com on test using SSL/TLS
+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_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/r/connection_type_win.result b/mysql-test/suite/perfschema/r/connection_type_win.result
new file mode 100644
index 00000000000..1852cefd483
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/connection_type_win.result
@@ -0,0 +1,81 @@
+"Default connection"
+select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+NAME	thread/sql/one_connection
+PROCESSLIST_USER	root
+PROCESSLIST_HOST	localhost
+CONNECTION_TYPE	TCP/IP
+create user 'root'@'santa.claus.ipv4.example.com';
+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_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;
+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
+where PROCESSLIST_ID = connection_id();
+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
+where PROCESSLIST_ID = connection_id();
+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
+where PROCESSLIST_ID = connection_id();
+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'
+     INTO TABLE test_log FIELDS TERMINATED BY '\n' LINES TERMINATED BY '\n';
+select user_host, command_type, argument from mysql.general_log
+where command_type = "Connect";
+user_host	[root] @ santa.claus.ipv4.example.com [192.0.2.4]
+command_type	Connect
+argument	root@santa.claus.ipv4.example.com on test using TCP/IP
+user_host	[root] @ santa.claus.ipv4.example.com [192.0.2.4]
+command_type	Connect
+argument	root@santa.claus.ipv4.example.com on test using TCP/IP
+user_host	[rootssl] @ santa.claus.ipv4.example.com [192.0.2.4]
+command_type	Connect
+argument	rootssl@santa.claus.ipv4.example.com on test using SSL/TLS
+select substring(argument, locate("Connect", argument)) from test_log
+where argument like "%Connect%on test%";
+substring(argument, locate("Connect", argument))	Connect	root@santa.claus.ipv4.example.com on test using TCP/IP
+substring(argument, locate("Connect", argument))	Connect	root@santa.claus.ipv4.example.com on test using TCP/IP
+substring(argument, locate("Connect", argument))	Connect	rootssl@santa.claus.ipv4.example.com on test using SSL/TLS
+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_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';
+drop user '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 84b39119dd8..0e50dc24927 100644
--- a/mysql-test/suite/perfschema/r/csv_table_io.result
+++ b/mysql-test/suite/perfschema/r/csv_table_io.result
@@ -70,63 +70,69 @@ 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
-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		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_%';
 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
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/ddl_esms_by_program.result b/mysql-test/suite/perfschema/r/ddl_esms_by_program.result
new file mode 100644
index 00000000000..66e49f8aeea
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_esms_by_program.result
@@ -0,0 +1,9 @@
+alter table performance_schema.events_statements_summary_by_program
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.events_statements_summary_by_program;
+ALTER TABLE performance_schema.events_statements_summary_by_program ADD INDEX test_index(OBJECT_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.events_statements_summary_by_program(OBJECT_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_ets_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_ets_by_account_by_event_name.result
new file mode 100644
index 00000000000..23bd048d8a6
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_ets_by_account_by_event_name.result
@@ -0,0 +1,10 @@
+alter table performance_schema.events_transactions_summary_by_account_by_event_name
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.events_transactions_summary_by_account_by_event_name;
+ALTER TABLE performance_schema.events_transactions_summary_by_account_by_event_name
+ADD INDEX test_index(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.events_transactions_summary_by_account_by_event_name(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_ets_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_ets_by_host_by_event_name.result
new file mode 100644
index 00000000000..7e3b5ccd70c
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_ets_by_host_by_event_name.result
@@ -0,0 +1,10 @@
+alter table performance_schema.events_transactions_summary_by_host_by_event_name
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.events_transactions_summary_by_host_by_event_name;
+ALTER TABLE performance_schema.events_transactions_summary_by_host_by_event_name
+ADD INDEX test_index(HOSTNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.events_transactions_summary_by_host_by_event_name(HOSTNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_ets_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_ets_by_thread_by_event_name.result
new file mode 100644
index 00000000000..bd3c57f9257
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_ets_by_thread_by_event_name.result
@@ -0,0 +1,9 @@
+alter table performance_schema.events_transactions_summary_by_thread_by_event_name
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.events_transactions_summary_by_thread_by_event_name;
+ALTER TABLE performance_schema.events_transactions_summary_by_thread_by_event_name ADD INDEX test_index(THREAD_ID);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.events_transactions_summary_by_thread_by_event_name(THREAD_ID);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_ets_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_ets_by_user_by_event_name.result
new file mode 100644
index 00000000000..981de1a7b19
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_ets_by_user_by_event_name.result
@@ -0,0 +1,10 @@
+alter table performance_schema.events_transactions_summary_by_user_by_event_name
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.events_transactions_summary_by_user_by_event_name;
+ALTER TABLE performance_schema.events_transactions_summary_by_user_by_event_name
+ADD INDEX test_index(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.events_transactions_summary_by_user_by_event_name(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_ets_global_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_ets_global_by_event_name.result
new file mode 100644
index 00000000000..13606ace640
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_ets_global_by_event_name.result
@@ -0,0 +1,10 @@
+alter table performance_schema.events_transactions_summary_global_by_event_name
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.events_transactions_summary_global_by_event_name;
+ALTER TABLE performance_schema.events_transactions_summary_global_by_event_name
+ADD INDEX test_index(EVENT_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.events_transactions_summary_global_by_event_name(EVENT_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
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 d9094ffb366..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,3 +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	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 0b6d6df06d2..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,3 +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	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 7843f61aa0d..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,3 +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	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_events_transactions_current.result b/mysql-test/suite/perfschema/r/ddl_events_transactions_current.result
new file mode 100644
index 00000000000..6d4d280118f
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_events_transactions_current.result
@@ -0,0 +1,7 @@
+alter table performance_schema.events_transactions_current add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.events_transactions_current;
+ALTER TABLE performance_schema.events_transactions_current ADD INDEX test_index(EVENT_ID);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index ON performance_schema.events_transactions_current(EVENT_ID);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_events_transactions_history.result b/mysql-test/suite/perfschema/r/ddl_events_transactions_history.result
new file mode 100644
index 00000000000..dbbac3ea9df
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_events_transactions_history.result
@@ -0,0 +1,7 @@
+alter table performance_schema.events_transactions_history add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.events_transactions_history;
+ALTER TABLE performance_schema.events_transactions_history ADD INDEX test_index(EVENT_ID);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index ON performance_schema.events_transactions_history(EVENT_ID);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_events_transactions_history_long.result b/mysql-test/suite/perfschema/r/ddl_events_transactions_history_long.result
new file mode 100644
index 00000000000..7a4a5f0542e
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_events_transactions_history_long.result
@@ -0,0 +1,7 @@
+alter table performance_schema.events_transactions_history_long add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.events_transactions_history_long;
+ALTER TABLE performance_schema.events_transactions_history_long ADD INDEX test_index(EVENT_ID);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index ON performance_schema.events_transactions_history_long(EVENT_ID);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_global_status.result b/mysql-test/suite/perfschema/r/ddl_global_status.result
new file mode 100644
index 00000000000..10af700eadd
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_global_status.result
@@ -0,0 +1,10 @@
+alter table performance_schema.global_status
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.global_status;
+ALTER TABLE performance_schema.global_status
+ADD INDEX test_index(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.global_status(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_global_variables.result b/mysql-test/suite/perfschema/r/ddl_global_variables.result
new file mode 100644
index 00000000000..e15b8166b2b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_global_variables.result
@@ -0,0 +1,11 @@
+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
+ALTER TABLE performance_schema.global_variables
+ADD INDEX test_index(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.global_variables(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_mems_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_mems_by_account_by_event_name.result
new file mode 100644
index 00000000000..4d7581a7c2e
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_mems_by_account_by_event_name.result
@@ -0,0 +1,10 @@
+alter table performance_schema.memory_summary_by_account_by_event_name
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.memory_summary_by_account_by_event_name;
+ALTER TABLE performance_schema.memory_summary_by_account_by_event_name
+ADD INDEX test_index(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.memory_summary_by_account_by_event_name(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_mems_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_mems_by_host_by_event_name.result
new file mode 100644
index 00000000000..dae5dd2445c
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_mems_by_host_by_event_name.result
@@ -0,0 +1,10 @@
+alter table performance_schema.memory_summary_by_host_by_event_name
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.memory_summary_by_host_by_event_name;
+ALTER TABLE performance_schema.memory_summary_by_host_by_event_name
+ADD INDEX test_index(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.memory_summary_by_host_by_event_name(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_mems_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_mems_by_thread_by_event_name.result
new file mode 100644
index 00000000000..eae9e7020e3
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_mems_by_thread_by_event_name.result
@@ -0,0 +1,10 @@
+alter table performance_schema.memory_summary_by_thread_by_event_name
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+ALTER TABLE performance_schema.memory_summary_by_thread_by_event_name
+ADD INDEX test_index(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.memory_summary_by_thread_by_event_name(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_mems_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_mems_by_user_by_event_name.result
new file mode 100644
index 00000000000..de6d52b69e6
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_mems_by_user_by_event_name.result
@@ -0,0 +1,10 @@
+alter table performance_schema.memory_summary_by_user_by_event_name
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.memory_summary_by_user_by_event_name;
+ALTER TABLE performance_schema.memory_summary_by_user_by_event_name
+ADD INDEX test_index(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.memory_summary_by_user_by_event_name(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_mems_global_by_event_name.result b/mysql-test/suite/perfschema/r/ddl_mems_global_by_event_name.result
new file mode 100644
index 00000000000..9ed8b2b6dab
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_mems_global_by_event_name.result
@@ -0,0 +1,10 @@
+alter table performance_schema.memory_summary_global_by_event_name
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.memory_summary_global_by_event_name;
+ALTER TABLE performance_schema.memory_summary_global_by_event_name
+ADD INDEX test_index(USERNAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.memory_summary_global_by_event_name(USERNAME);
+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
new file mode 100644
index 00000000000..426ec66943e
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_metadata_locks.result
@@ -0,0 +1,8 @@
+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
+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);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_prepared_statements_instances.result b/mysql-test/suite/perfschema/r/ddl_prepared_statements_instances.result
new file mode 100644
index 00000000000..d71e6c1ebf4
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_prepared_statements_instances.result
@@ -0,0 +1,9 @@
+alter table performance_schema.prepared_statements_instances
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.prepared_statements_instances;
+ALTER TABLE performance_schema.prepared_statements_instances ADD INDEX test_index(OWNER_OBJECT_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.prepared_statements_instances(OWNER_OBJECT_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result b/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result
new file mode 100644
index 00000000000..db79022cbb4
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result
@@ -0,0 +1,11 @@
+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
+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'
+CREATE UNIQUE INDEX test_index ON
+performance_schema.replication_applier_configuration(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
new file mode 100644
index 00000000000..a6306e976ba
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_replication_applier_status.result
@@ -0,0 +1,11 @@
+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
+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'
+CREATE UNIQUE INDEX test_index ON
+performance_schema.replication_applier_status(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
new file mode 100644
index 00000000000..414e8291ba8
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result
@@ -0,0 +1,11 @@
+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
+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'
+CREATE UNIQUE INDEX test_index ON
+performance_schema.replication_applier_status_by_coordinator(thread_id);
+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_worker.result b/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_worker.result
new file mode 100644
index 00000000000..e13b4f978e1
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_worker.result
@@ -0,0 +1,11 @@
+ALTER TABLE performance_schema.replication_applier_status_by_worker
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+TRUNCATE TABLE performance_schema.replication_applier_status_by_worker;
+ERROR HY000: Invalid performance_schema usage.
+ALTER TABLE performance_schema.replication_applier_status_by_worker
+ADD INDEX test_index(worker_id);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index ON
+performance_schema.replication_applier_status_by_worker(worker_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
new file mode 100644
index 00000000000..19de9281a13
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_replication_connection_configuration.result
@@ -0,0 +1,11 @@
+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
+ALTER TABLE performance_schema.replication_connection_configuration
+ADD INDEX test_index(HOST);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.replication_connection_configuration(HOST);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_replication_connection_status.result b/mysql-test/suite/perfschema/r/ddl_replication_connection_status.result
new file mode 100644
index 00000000000..4c650b030ed
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_replication_connection_status.result
@@ -0,0 +1,11 @@
+ALTER TABLE performance_schema.replication_connection_status
+ADD COLUMN foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+TRUNCATE TABLE performance_schema.replication_connection_status;
+ERROR HY000: Invalid performance_schema usage.
+ALTER TABLE performance_schema.replication_connection_status
+ADD INDEX test_index(Thread_Id);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.replication_connection_status(Thread_Id);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_replication_group_member_stats.result b/mysql-test/suite/perfschema/r/ddl_replication_group_member_stats.result
new file mode 100644
index 00000000000..cab3b0874fa
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_replication_group_member_stats.result
@@ -0,0 +1,11 @@
+ALTER TABLE performance_schema.replication_group_member_stats
+ADD COLUMN foo INTEGER;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+TRUNCATE TABLE performance_schema.replication_group_member_stats;
+ERROR HY000: Invalid performance_schema usage.
+ALTER TABLE performance_schema.replication_group_member_stats
+ADD INDEX test_index(Member_Id);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.replication_group_member_stats(Member_Id);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_replication_group_members.result b/mysql-test/suite/perfschema/r/ddl_replication_group_members.result
new file mode 100644
index 00000000000..25ed912a11a
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_replication_group_members.result
@@ -0,0 +1,11 @@
+ALTER TABLE performance_schema.replication_group_members
+ADD COLUMN foo INTEGER;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+TRUNCATE TABLE performance_schema.replication_group_members;
+ERROR HY000: Invalid performance_schema usage.
+ALTER TABLE performance_schema.replication_group_members
+ADD INDEX test_index(Member_Id);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.replication_group_members(Member_Id);
+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
new file mode 100644
index 00000000000..de5669a3a64
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_session_status.result
@@ -0,0 +1,11 @@
+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
+ALTER TABLE performance_schema.session_status
+ADD INDEX test_index(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.session_status(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
new file mode 100644
index 00000000000..add637059b7
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_session_variables.result
@@ -0,0 +1,11 @@
+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
+ALTER TABLE performance_schema.session_variables
+ADD INDEX test_index(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.session_variables(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_setup_actors.result b/mysql-test/suite/perfschema/r/ddl_setup_actors.result
index 753632eb62d..c17314e4362 100644
--- a/mysql-test/suite/perfschema/r/ddl_setup_actors.result
+++ b/mysql-test/suite/perfschema/r/ddl_setup_actors.result
@@ -14,3 +14,5 @@ ALTER TABLE performance_schema.setup_actors ADD INDEX test_index(HOST);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 CREATE UNIQUE INDEX test_index ON performance_schema.setup_actors(HOST);
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+ALTER TABLE performance_schema.setup_actors ADD KEY ENA(ENABLED);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_status_by_account.result b/mysql-test/suite/perfschema/r/ddl_status_by_account.result
new file mode 100644
index 00000000000..d21b7ed1e0b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_status_by_account.result
@@ -0,0 +1,10 @@
+alter table performance_schema.status_by_account
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.status_by_account;
+ALTER TABLE performance_schema.status_by_account
+ADD INDEX test_index(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.status_by_account(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_status_by_host.result b/mysql-test/suite/perfschema/r/ddl_status_by_host.result
new file mode 100644
index 00000000000..5e4ba3573e6
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_status_by_host.result
@@ -0,0 +1,10 @@
+alter table performance_schema.status_by_host
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.status_by_host;
+ALTER TABLE performance_schema.status_by_host
+ADD INDEX test_index(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.status_by_host(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_status_by_thread.result b/mysql-test/suite/perfschema/r/ddl_status_by_thread.result
new file mode 100644
index 00000000000..2333af91c10
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_status_by_thread.result
@@ -0,0 +1,10 @@
+alter table performance_schema.status_by_thread
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.status_by_thread;
+ALTER TABLE performance_schema.status_by_thread
+ADD INDEX test_index(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.status_by_thread(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_status_by_user.result b/mysql-test/suite/perfschema/r/ddl_status_by_user.result
new file mode 100644
index 00000000000..c7d396db225
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_status_by_user.result
@@ -0,0 +1,10 @@
+alter table performance_schema.status_by_user
+add column foo integer;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+truncate table performance_schema.status_by_user;
+ALTER TABLE performance_schema.status_by_user
+ADD INDEX test_index(VARIABLE_NAME);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.status_by_user(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
new file mode 100644
index 00000000000..79b7c96e2a3
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_table_handles.result
@@ -0,0 +1,8 @@
+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
+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);
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result b/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result
new file mode 100644
index 00000000000..b9961faa221
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result
@@ -0,0 +1,11 @@
+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
+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'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.user_variables_by_thread(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
new file mode 100644
index 00000000000..43e2f24f7fc
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/ddl_variables_by_thread.result
@@ -0,0 +1,11 @@
+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
+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'
+CREATE UNIQUE INDEX test_index
+ON performance_schema.variables_by_thread(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 5c8d2eb23d1..84a7b5c3c7c 100644
--- a/mysql-test/suite/perfschema/r/digest_table_full.result
+++ b/mysql-test/suite/perfschema/r/digest_table_full.result
@@ -114,7 +114,7 @@ SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 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";
+SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size";
 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_esms_by_program.result b/mysql-test/suite/perfschema/r/dml_esms_by_program.result
new file mode 100644
index 00000000000..b8c86fe3e45
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_esms_by_program.result
@@ -0,0 +1,27 @@
+select * from performance_schema.events_statements_summary_by_program
+where object_name like 'XXYYZZ%' limit 1;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_STATEMENTS	SUM_STATEMENTS_WAIT	MIN_STATEMENTS_WAIT	AVG_STATEMENTS_WAIT	MAX_STATEMENTS_WAIT	SUM_LOCK_TIME	SUM_ERRORS	SUM_WARNINGS	SUM_ROWS_AFFECTED	SUM_ROWS_SENT	SUM_ROWS_EXAMINED	SUM_CREATED_TMP_DISK_TABLES	SUM_CREATED_TMP_TABLES	SUM_SELECT_FULL_JOIN	SUM_SELECT_FULL_RANGE_JOIN	SUM_SELECT_RANGE	SUM_SELECT_RANGE_CHECK	SUM_SELECT_SCAN	SUM_SORT_MERGE_PASSES	SUM_SORT_RANGE	SUM_SORT_ROWS	SUM_SORT_SCAN	SUM_NO_INDEX_USED	SUM_NO_GOOD_INDEX_USED
+select * from performance_schema.events_statements_summary_by_program
+where object_name='XXYYZZ';
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_STATEMENTS	SUM_STATEMENTS_WAIT	MIN_STATEMENTS_WAIT	AVG_STATEMENTS_WAIT	MAX_STATEMENTS_WAIT	SUM_LOCK_TIME	SUM_ERRORS	SUM_WARNINGS	SUM_ROWS_AFFECTED	SUM_ROWS_SENT	SUM_ROWS_EXAMINED	SUM_CREATED_TMP_DISK_TABLES	SUM_CREATED_TMP_TABLES	SUM_SELECT_FULL_JOIN	SUM_SELECT_FULL_RANGE_JOIN	SUM_SELECT_RANGE	SUM_SELECT_RANGE_CHECK	SUM_SELECT_SCAN	SUM_SORT_MERGE_PASSES	SUM_SORT_RANGE	SUM_SORT_ROWS	SUM_SORT_SCAN	SUM_NO_INDEX_USED	SUM_NO_GOOD_INDEX_USED
+insert into performance_schema.events_statements_summary_by_program
+set object_name='XXYYZZ', count_star=1, sum_timer_wait=2, min_timer_wait=3,
+avg_timer_wait=4, max_timer_wait=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+update performance_schema.events_statements_summary_by_program
+set count_star=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+update performance_schema.events_statements_summary_by_program
+set count_star=12 where object_name like "XXYYZZ";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+delete from performance_schema.events_statements_summary_by_program
+where count_star=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+delete from performance_schema.events_statements_summary_by_program;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+LOCK TABLES performance_schema.events_statements_summary_by_program READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.events_statements_summary_by_program WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_statements_summary_by_program'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result
new file mode 100644
index 00000000000..66a0f733d19
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_account_by_event_name.result
@@ -0,0 +1,26 @@
+select * from performance_schema.events_transactions_summary_by_account_by_event_name
+where event_name in ('transaction') limit 1;
+select * from performance_schema.events_transactions_summary_by_account_by_event_name
+where event_name='FOO';
+insert into performance_schema.events_transactions_summary_by_account_by_event_name
+set event_name='FOO', user='BAR', host='BAZ',
+count_star=1, sum_timer_wait=2, min_timer_wait=3,
+avg_timer_wait=4, max_timer_wait=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+update performance_schema.events_transactions_summary_by_account_by_event_name
+set count_star=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+update performance_schema.events_transactions_summary_by_account_by_event_name
+set count_star=12 where event_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+delete from performance_schema.events_transactions_summary_by_account_by_event_name
+where count_star=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+delete from performance_schema.events_transactions_summary_by_account_by_event_name;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+LOCK TABLES performance_schema.events_transactions_summary_by_account_by_event_name READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.events_transactions_summary_by_account_by_event_name WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_account_by_event_name'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result
new file mode 100644
index 00000000000..194d8ff0b4b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_host_by_event_name.result
@@ -0,0 +1,26 @@
+select * from performance_schema.events_transactions_summary_by_host_by_event_name
+where event_name in ('transaction') limit 1;
+select * from performance_schema.events_transactions_summary_by_host_by_event_name
+where event_name='FOO';
+insert into performance_schema.events_transactions_summary_by_host_by_event_name
+set event_name='FOO', thread_id=1,
+count_star=1, sum_timer_wait=2, min_timer_wait=3,
+avg_timer_wait=4, max_timer_wait=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+update performance_schema.events_transactions_summary_by_host_by_event_name
+set count_star=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+update performance_schema.events_transactions_summary_by_host_by_event_name
+set count_star=12 where event_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+delete from performance_schema.events_transactions_summary_by_host_by_event_name
+where count_star=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+delete from performance_schema.events_transactions_summary_by_host_by_event_name;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+LOCK TABLES performance_schema.events_transactions_summary_by_host_by_event_name READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.events_transactions_summary_by_host_by_event_name WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_host_by_event_name'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result
new file mode 100644
index 00000000000..f096d265457
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_thread_by_event_name.result
@@ -0,0 +1,26 @@
+select * from performance_schema.events_transactions_summary_by_thread_by_event_name
+where event_name in ('transaction') limit 1;
+select * from performance_schema.events_transactions_summary_by_thread_by_event_name
+where event_name='FOO';
+insert into performance_schema.events_transactions_summary_by_thread_by_event_name
+set event_name='FOO', thread_id=1,
+count_star=1, sum_timer_wait=2, min_timer_wait=3,
+avg_timer_wait=4, max_timer_wait=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+update performance_schema.events_transactions_summary_by_thread_by_event_name
+set count_star=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+update performance_schema.events_transactions_summary_by_thread_by_event_name
+set count_star=12 where event_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+delete from performance_schema.events_transactions_summary_by_thread_by_event_name
+where count_star=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+delete from performance_schema.events_transactions_summary_by_thread_by_event_name;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+LOCK TABLES performance_schema.events_transactions_summary_by_thread_by_event_name READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.events_transactions_summary_by_thread_by_event_name WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_thread_by_event_name'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result
new file mode 100644
index 00000000000..11d455a35a7
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_ets_by_user_by_event_name.result
@@ -0,0 +1,26 @@
+select * from performance_schema.events_transactions_summary_by_user_by_event_name
+where event_name in ('transaction') limit 1;
+select * from performance_schema.events_transactions_summary_by_user_by_event_name
+where event_name='FOO';
+insert into performance_schema.events_transactions_summary_by_user_by_event_name
+set event_name='FOO', user='BAR',
+count_star=1, sum_timer_wait=2, min_timer_wait=3,
+avg_timer_wait=4, max_timer_wait=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+update performance_schema.events_transactions_summary_by_user_by_event_name
+set count_star=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+update performance_schema.events_transactions_summary_by_user_by_event_name
+set count_star=12 where event_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+delete from performance_schema.events_transactions_summary_by_user_by_event_name
+where count_star=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+delete from performance_schema.events_transactions_summary_by_user_by_event_name;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+LOCK TABLES performance_schema.events_transactions_summary_by_user_by_event_name READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.events_transactions_summary_by_user_by_event_name WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_by_user_by_event_name'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result
new file mode 100644
index 00000000000..0f2bd599af8
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_ets_global_by_event_name.result
@@ -0,0 +1,25 @@
+select * from performance_schema.events_transactions_summary_global_by_event_name
+where event_name in ('transaction') limit 1;
+select * from performance_schema.events_transactions_summary_global_by_event_name
+where event_name='FOO';
+insert into performance_schema.events_transactions_summary_global_by_event_name
+set event_name='FOO', count_star=1, sum_timer_wait=2, min_timer_wait=3,
+avg_timer_wait=4, max_timer_wait=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+update performance_schema.events_transactions_summary_global_by_event_name
+set count_star=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+update performance_schema.events_transactions_summary_global_by_event_name
+set count_star=12 where event_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+delete from performance_schema.events_transactions_summary_global_by_event_name
+where count_star=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+delete from performance_schema.events_transactions_summary_global_by_event_name;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+LOCK TABLES performance_schema.events_transactions_summary_global_by_event_name READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.events_transactions_summary_global_by_event_name WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_summary_global_by_event_name'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_transactions_current.result b/mysql-test/suite/perfschema/r/dml_events_transactions_current.result
new file mode 100644
index 00000000000..9a6c4f3bd58
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_events_transactions_current.result
@@ -0,0 +1,25 @@
+select * from performance_schema.events_transactions_current
+where event_name in ('transaction') limit 1;
+select * from performance_schema.events_transactions_current
+where event_name='FOO';
+insert into performance_schema.events_transactions_current
+set thread_id='1', event_id=1,
+event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_current'
+update performance_schema.events_transactions_current
+set timer_start=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+update performance_schema.events_transactions_current
+set timer_start=12 where thread_id=0;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+delete from performance_schema.events_transactions_current
+where thread_id=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+delete from performance_schema.events_transactions_current;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_current'
+LOCK TABLES performance_schema.events_transactions_current READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_current'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.events_transactions_current WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_current'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_transactions_history.result b/mysql-test/suite/perfschema/r/dml_events_transactions_history.result
new file mode 100644
index 00000000000..000e6a26753
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_events_transactions_history.result
@@ -0,0 +1,29 @@
+select * from performance_schema.events_transactions_history
+where event_name in ('transaction') limit 1;
+select * from performance_schema.events_transactions_history
+where event_name='FOO';
+select * from performance_schema.events_transactions_history
+where event_name in ('transaction') order by timer_wait limit 1;
+select * from performance_schema.events_transactions_history
+where event_name in ('transaction') order by timer_wait desc limit 1;
+insert into performance_schema.events_transactions_history
+set thread_id='1', event_id=1,
+event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_history'
+update performance_schema.events_transactions_history
+set timer_start=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+update performance_schema.events_transactions_history
+set timer_start=12 where thread_id=0;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+delete from performance_schema.events_transactions_history
+where thread_id=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+delete from performance_schema.events_transactions_history;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history'
+LOCK TABLES performance_schema.events_transactions_history READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.events_transactions_history WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result b/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result
new file mode 100644
index 00000000000..e954bcd1be1
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_events_transactions_history_long.result
@@ -0,0 +1,29 @@
+select * from performance_schema.events_transactions_history_long
+where event_name in ('transaction') limit 1;
+select * from performance_schema.events_transactions_history_long
+where event_name='FOO';
+select * from performance_schema.events_transactions_history_long
+where event_name in ('transaction') order by timer_wait limit 1;
+select * from performance_schema.events_transactions_history_long
+where event_name in ('transaction') order by timer_wait desc limit 1;
+insert into performance_schema.events_transactions_history_long
+set thread_id='1', event_id=1,
+event_name='FOO', timer_start=1, timer_end=2, timer_wait=3;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+update performance_schema.events_transactions_history_long
+set timer_start=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+update performance_schema.events_transactions_history_long
+set timer_start=12 where thread_id=0;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+delete from performance_schema.events_transactions_history_long
+where thread_id=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+delete from performance_schema.events_transactions_history_long;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+LOCK TABLES performance_schema.events_transactions_history_long READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.events_transactions_history_long WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'events_transactions_history_long'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_file_instances.result b/mysql-test/suite/perfschema/r/dml_file_instances.result
index d2564cb58dd..a13c570a5ad 100644
--- a/mysql-test/suite/perfschema/r/dml_file_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_file_instances.result
@@ -18,3 +18,62 @@ UNLOCK TABLES;
 LOCK TABLES performance_schema.file_instances WRITE;
 ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'file_instances'
 UNLOCK TABLES;
+###
+### Bug#26152751: INNODB LEAKS MEMORY, PERFORMANCE_SCHEMA FILE_INSTANCES
+###               #SQL-IB3129987-252773.IBD
+###
+CREATE DATABASE db_26152751;
+USE db_26152751;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+CREATE TABLE t_db_26152751 (a INT) ENGINE=MYISAM;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+t_db_26152751.frm
+t_db_26152751.MYI
+t_db_26152751.MYD
+RENAME TABLE t_db_26152751 to t_db_26152751_new;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+t_db_26152751_new.frm
+t_db_26152751_new.MYI
+t_db_26152751_new.MYD
+RENAME TABLE t_db_26152751_new to t_db_26152751;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+t_db_26152751.frm
+t_db_26152751.MYI
+t_db_26152751.MYD
+ALTER TABLE t_db_26152751 ADD COLUMN b INT;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+t_db_26152751.frm
+t_db_26152751.MYI
+t_db_26152751.MYD
+DROP TABLE t_db_26152751;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+CREATE TABLE t_db_26152751 (a INT) ENGINE=INNODB;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+t_db_26152751.frm
+t_db_26152751.ibd
+RENAME TABLE t_db_26152751 to t_db_26152751_new;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+t_db_26152751_new.frm
+t_db_26152751_new.ibd
+RENAME TABLE t_db_26152751_new to t_db_26152751;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+t_db_26152751.frm
+t_db_26152751.ibd
+ALTER TABLE t_db_26152751 ADD COLUMN b INT;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+t_db_26152751.frm
+t_db_26152751.ibd
+DROP TABLE t_db_26152751;
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+FILE_NAME
+DROP DATABASE db_26152751;
diff --git a/mysql-test/suite/perfschema/r/dml_global_status.result b/mysql-test/suite/perfschema/r/dml_global_status.result
new file mode 100644
index 00000000000..90b7ac8147f
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_global_status.result
@@ -0,0 +1,21 @@
+select * from performance_schema.global_status
+where variable_name like 'bytes_%' limit 1;
+select * from performance_schema.global_status
+where variable_name='FOO';
+insert into performance_schema.global_status
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'global_status'
+update performance_schema.global_status
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'global_status'
+delete from performance_schema.global_status
+where variable_name <> 'FOO';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'global_status'
+delete from performance_schema.global_status;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'global_status'
+LOCK TABLES performance_schema.global_status READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'global_status'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.global_status WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'global_status'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_global_variables.result b/mysql-test/suite/perfschema/r/dml_global_variables.result
new file mode 100644
index 00000000000..08d15af34d3
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_global_variables.result
@@ -0,0 +1,21 @@
+select * from performance_schema.global_variables
+where variable_name like 'autocommit%' limit 1;
+select * from performance_schema.global_variables
+where variable_name='FOO';
+insert into performance_schema.global_variables
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'global_variables'
+update performance_schema.global_variables
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'global_variables'
+delete from performance_schema.global_variables
+where variable_name <> 'FOO';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'global_variables'
+delete from performance_schema.global_variables;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'global_variables'
+LOCK TABLES performance_schema.global_variables READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'global_variables'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.global_variables WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'global_variables'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_handler.result b/mysql-test/suite/perfschema/r/dml_handler.result
index ce0f87e7733..57d0f05cd8d 100644
--- a/mysql-test/suite/perfschema/r/dml_handler.result
+++ b/mysql-test/suite/perfschema/r/dml_handler.result
@@ -12,114 +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=52;
+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;
 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=57;
+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_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_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.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.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.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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=51;
 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=50;
 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49;
+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_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_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_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_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.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: 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42;
 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41;
+HANDLER performance_schema.global_status OPEN;
+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: 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39;
 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38;
 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;
+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: 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;
+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: 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;
+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: 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34;
 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;
+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: 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;
+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: 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=31;
 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=30;
 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;
+SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=29;
 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;
+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: 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: 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: 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: 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: 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: 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: 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: 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: 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;
+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: 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;
+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: 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: 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_mems_by_account_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result
new file mode 100644
index 00000000000..6333ae9c3c3
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_account_by_event_name.result
@@ -0,0 +1,26 @@
+select * from performance_schema.memory_summary_by_account_by_event_name
+where event_name like 'memory/%' limit 1;
+select * from performance_schema.memory_summary_by_account_by_event_name
+where event_name='FOO';
+insert into performance_schema.memory_summary_by_account_by_event_name
+set event_name='FOO', user='BAR', host='BAZ',
+count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
+sum_number_of_bytes_free=4, low_count_used=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+update performance_schema.memory_summary_by_account_by_event_name
+set count_alloc=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+update performance_schema.memory_summary_by_account_by_event_name
+set count_alloc=12 where event_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+delete from performance_schema.memory_summary_by_account_by_event_name
+where count_alloc=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+delete from performance_schema.memory_summary_by_account_by_event_name;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+LOCK TABLES performance_schema.memory_summary_by_account_by_event_name READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.memory_summary_by_account_by_event_name WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_account_by_event_name'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result
new file mode 100644
index 00000000000..6e2c855c581
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_host_by_event_name.result
@@ -0,0 +1,26 @@
+select * from performance_schema.memory_summary_by_host_by_event_name
+where event_name like 'memory/%' limit 1;
+select * from performance_schema.memory_summary_by_host_by_event_name
+where event_name='FOO';
+insert into performance_schema.memory_summary_by_host_by_event_name
+set event_name='FOO', host='BAZ',
+count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
+sum_number_of_bytes_free=4, low_count_used=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+update performance_schema.memory_summary_by_host_by_event_name
+set count_alloc=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+update performance_schema.memory_summary_by_host_by_event_name
+set count_alloc=12 where event_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+delete from performance_schema.memory_summary_by_host_by_event_name
+where count_alloc=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+delete from performance_schema.memory_summary_by_host_by_event_name;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+LOCK TABLES performance_schema.memory_summary_by_host_by_event_name READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.memory_summary_by_host_by_event_name WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_host_by_event_name'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result
new file mode 100644
index 00000000000..f1576b22896
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_thread_by_event_name.result
@@ -0,0 +1,26 @@
+select * from performance_schema.memory_summary_by_thread_by_event_name
+where event_name like 'memory/%' limit 1;
+select * from performance_schema.memory_summary_by_thread_by_event_name
+where event_name='FOO';
+insert into performance_schema.memory_summary_by_thread_by_event_name
+set event_name='FOO', thread_id=12,
+count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
+sum_number_of_bytes_free=4, low_count_used=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+update performance_schema.memory_summary_by_thread_by_event_name
+set count_alloc=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+update performance_schema.memory_summary_by_thread_by_event_name
+set count_alloc=12 where event_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+delete from performance_schema.memory_summary_by_thread_by_event_name
+where count_alloc=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+delete from performance_schema.memory_summary_by_thread_by_event_name;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+LOCK TABLES performance_schema.memory_summary_by_thread_by_event_name READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.memory_summary_by_thread_by_event_name WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_thread_by_event_name'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result
new file mode 100644
index 00000000000..3beab7f9ba4
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_mems_by_user_by_event_name.result
@@ -0,0 +1,26 @@
+select * from performance_schema.memory_summary_by_user_by_event_name
+where event_name like 'memory/%' limit 1;
+select * from performance_schema.memory_summary_by_user_by_event_name
+where event_name='FOO';
+insert into performance_schema.memory_summary_by_user_by_event_name
+set event_name='FOO', user='BAR',
+count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
+sum_number_of_bytes_free=4, low_count_used=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+update performance_schema.memory_summary_by_user_by_event_name
+set count_alloc=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+update performance_schema.memory_summary_by_user_by_event_name
+set count_alloc=12 where event_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+delete from performance_schema.memory_summary_by_user_by_event_name
+where count_alloc=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+delete from performance_schema.memory_summary_by_user_by_event_name;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+LOCK TABLES performance_schema.memory_summary_by_user_by_event_name READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.memory_summary_by_user_by_event_name WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_by_user_by_event_name'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result b/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result
new file mode 100644
index 00000000000..06ac00d1d8f
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_mems_global_by_event_name.result
@@ -0,0 +1,26 @@
+select * from performance_schema.memory_summary_global_by_event_name
+where event_name like 'memory/%' limit 1;
+select * from performance_schema.memory_summary_global_by_event_name
+where event_name='FOO';
+insert into performance_schema.memory_summary_global_by_event_name
+set event_name='FOO',
+count_alloc=1, count_free=2, sum_number_of_bytes_alloc=3,
+sum_number_of_bytes_free=4, low_count_used=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+update performance_schema.memory_summary_global_by_event_name
+set count_alloc=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+update performance_schema.memory_summary_global_by_event_name
+set count_alloc=12 where event_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+delete from performance_schema.memory_summary_global_by_event_name
+where count_alloc=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+delete from performance_schema.memory_summary_global_by_event_name;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+LOCK TABLES performance_schema.memory_summary_global_by_event_name READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.memory_summary_global_by_event_name WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'memory_summary_global_by_event_name'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_metadata_locks.result b/mysql-test/suite/perfschema/r/dml_metadata_locks.result
new file mode 100644
index 00000000000..03f62bc95c5
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_metadata_locks.result
@@ -0,0 +1,21 @@
+select * from performance_schema.metadata_locks;
+select * from performance_schema.metadata_locks
+where object_name='foo';
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	LOCK_TYPE	LOCK_DURATION	LOCK_STATUS	SOURCE	OWNER_THREAD_ID	OWNER_EVENT_ID
+insert into performance_schema.metadata_locks
+set object_name='FOO', owner_thread_id=1;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'metadata_locks'
+update performance_schema.metadata_locks
+set owner_thread_id=12 where object_name='foo';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'metadata_locks'
+delete from performance_schema.metadata_locks;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'metadata_locks'
+delete from performance_schema.metadata_locks
+where timer_name='CYCLE';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'metadata_locks'
+LOCK TABLES performance_schema.metadata_locks READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'metadata_locks'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.metadata_locks WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'metadata_locks'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result b/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result
new file mode 100644
index 00000000000..dbccb963a61
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_prepared_statements_instances.result
@@ -0,0 +1,26 @@
+select * from performance_schema.prepared_statements_instances
+where owner_object_name like 'XXYYZZ%' limit 1;
+OBJECT_INSTANCE_BEGIN	STATEMENT_ID	STATEMENT_NAME	SQL_TEXT	OWNER_THREAD_ID	OWNER_EVENT_ID	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME	TIMER_PREPARE	COUNT_REPREPARE	COUNT_EXECUTE	SUM_TIMER_EXECUTE	MIN_TIMER_EXECUTE	AVG_TIMER_EXECUTE	MAX_TIMER_EXECUTE	SUM_LOCK_TIME	SUM_ERRORS	SUM_WARNINGS	SUM_ROWS_AFFECTED	SUM_ROWS_SENT	SUM_ROWS_EXAMINED	SUM_CREATED_TMP_DISK_TABLES	SUM_CREATED_TMP_TABLES	SUM_SELECT_FULL_JOIN	SUM_SELECT_FULL_RANGE_JOIN	SUM_SELECT_RANGE	SUM_SELECT_RANGE_CHECK	SUM_SELECT_SCAN	SUM_SORT_MERGE_PASSES	SUM_SORT_RANGE	SUM_SORT_ROWS	SUM_SORT_SCAN	SUM_NO_INDEX_USED	SUM_NO_GOOD_INDEX_USED
+select * from performance_schema.prepared_statements_instances
+where owner_object_name='XXYYZZ';
+OBJECT_INSTANCE_BEGIN	STATEMENT_ID	STATEMENT_NAME	SQL_TEXT	OWNER_THREAD_ID	OWNER_EVENT_ID	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME	TIMER_PREPARE	COUNT_REPREPARE	COUNT_EXECUTE	SUM_TIMER_EXECUTE	MIN_TIMER_EXECUTE	AVG_TIMER_EXECUTE	MAX_TIMER_EXECUTE	SUM_LOCK_TIME	SUM_ERRORS	SUM_WARNINGS	SUM_ROWS_AFFECTED	SUM_ROWS_SENT	SUM_ROWS_EXAMINED	SUM_CREATED_TMP_DISK_TABLES	SUM_CREATED_TMP_TABLES	SUM_SELECT_FULL_JOIN	SUM_SELECT_FULL_RANGE_JOIN	SUM_SELECT_RANGE	SUM_SELECT_RANGE_CHECK	SUM_SELECT_SCAN	SUM_SORT_MERGE_PASSES	SUM_SORT_RANGE	SUM_SORT_ROWS	SUM_SORT_SCAN	SUM_NO_INDEX_USED	SUM_NO_GOOD_INDEX_USED
+insert into performance_schema.prepared_statements_instances
+set owner_object_name='XXYYZZ', count_execute=1, sum_timer_execute=2,
+min_timer_execute=3, avg_timer_execute=4, max_timer_execute=5;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+update performance_schema.prepared_statements_instances set count_execute=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+update performance_schema.prepared_statements_instances
+set count_execute=12 where owner_object_name like "XXYYZZ";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+delete from performance_schema.prepared_statements_instances
+where count_execute=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+delete from performance_schema.prepared_statements_instances;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+LOCK TABLES performance_schema.prepared_statements_instances READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.prepared_statements_instances WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'prepared_statements_instances'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result b/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result
new file mode 100644
index 00000000000..0e5711b5732
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_configuration.result
@@ -0,0 +1,21 @@
+SELECT * FROM performance_schema.replication_applier_configuration
+LIMIT 1;
+sELECT * FROM performance_schema.replication_applier_configuration
+WHERE desired_delay=12;
+INSERT INTO performance_schema.replication_applier_configuration
+SET desired_delay=2;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+UPDATE performance_schema.replication_applier_configuration
+SET desired_delay=12 WHERE desired_delay=2;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+DELETE FROM performance_schema.replication_applier_configuration
+WHERE desired_delay=12;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+DELETE FROM performance_schema.replication_applier_configuration;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+LOCK TABLES performance_schema.replication_applier_configuration READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.replication_applier_configuration WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_configuration'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_status.result b/mysql-test/suite/perfschema/r/dml_replication_applier_status.result
new file mode 100644
index 00000000000..e6464c58e85
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_status.result
@@ -0,0 +1,24 @@
+SELECT * FROM performance_schema.replication_applier_status
+LIMIT 1;
+SELECT * FROM performance_schema.replication_applier_status
+WHERE service_state='YES' OR remaining_delay=12;
+INSERT INTO performance_schema.replication_applier_status
+SET service_state='YES', remaining_delay=12;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_status'
+UPDATE performance_schema.replication_applier_status
+SET remaining_delay=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+UPDATE performance_schema.replication_applier_status
+SET remaining_delay=12 WHERE service_state='YES';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+DELETE FROM performance_schema.replication_applier_status
+WHERE service_state='YES';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+DELETE FROM performance_schema.replication_applier_status;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status'
+LOCK TABLES performance_schema.replication_applier_status READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.replication_applier_status WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result
new file mode 100644
index 00000000000..d6818fd1280
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_coordinator.result
@@ -0,0 +1,25 @@
+SELECT * FROM performance_schema.replication_applier_status_by_coordinator
+LIMIT 1;
+SELECT * FROM performance_schema.replication_applier_status_by_coordinator
+WHERE service_state='YES' or last_error_message='ERROR';
+INSERT INTO performance_schema.replication_applier_status_by_coordinator
+SET service_state='YES', last_error_message='ERROR', thread_id=2,
+last_error_number=1234;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+UPDATE performance_schema.replication_applier_status_by_coordinator
+SET last_error_number=1234;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+UPDATE performance_schema.replication_applier_status_by_coordinator
+SET last_error_number=1234 where service_state like "YES";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+DELETE FROM performance_schema.replication_applier_status_by_coordinator
+WHERE thread_id=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+DELETE FROM performance_schema.replication_applier_status_by_coordinator;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+LOCK TABLES performance_schema.replication_applier_status_by_coordinator READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.replication_applier_status_by_coordinator WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_coordinator'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result
new file mode 100644
index 00000000000..8033da46a1d
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_replication_applier_status_by_worker.result
@@ -0,0 +1,25 @@
+SELECT * FROM performance_schema.replication_applier_status_by_worker
+LIMIT 1;
+SELECT * FROM performance_schema.replication_applier_status_by_worker
+WHERE service_state='YES' OR last_error_message='ERROR';
+INSERT INTO performance_schema.replication_applier_status_by_worker
+SET service_state='YES', last_error_message='ERROR',
+worker_id=1, thread_id=2, last_error_number=1234;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+UPDATE performance_schema.replication_applier_status_by_worker
+SET worker_id=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+UPDATE performance_schema.replication_applier_status_by_worker
+SET worker_d=12 where service_state like "YES";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+DELETE FROM performance_schema.replication_applier_status_by_worker
+WHERE worker_id=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+DELETE FROM performance_schema.replication_applier_status_by_worker;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+LOCK TABLES performance_schema.replication_applier_status_by_worker READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.replication_applier_status_by_worker WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_applier_status_by_worker'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result b/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result
new file mode 100644
index 00000000000..d338d4ab38a
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_replication_connection_configuration.result
@@ -0,0 +1,25 @@
+SELECT * FROM performance_schema.replication_connection_configuration
+LIMIT 1;
+SELECT * FROM performance_schema.replication_connection_configuration
+WHERE user='FOO' or host='BAR';
+INSERT INTO performance_schema.replication_connection_configuration
+SET user='FOO', host='BAR',
+port=1, connection_retry_count=2;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+UPDATE performance_schema.replication_connection_configuration
+SET connection_retry_interval=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+UPDATE performance_schema.replication_connection_configuration
+SET connection_retry_interval=12 WHERE host LIKE "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+DELETE FROM performance_schema.replication_connection_configuration
+WHERE connection_retry_count=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+DELETE FROM performance_schema.replication_connection_configuration;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+LOCK TABLES performance_schema.replication_connection_configuration READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.replication_connection_configuration WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_connection_configuration'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_connection_status.result b/mysql-test/suite/perfschema/r/dml_replication_connection_status.result
new file mode 100644
index 00000000000..981a064f534
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_replication_connection_status.result
@@ -0,0 +1,25 @@
+SELECT * FROM performance_schema.replication_connection_status
+LIMIT 1;
+SELECT * FROM performance_schema.replication_connection_status
+WHERE received_transaction_set='FOO' OR last_error_message='BAR';
+INSERT INTO performance_schema.replication_connection_status
+SET received_transaction_set='FOO', last_error_message='BAR',
+thread_id=1, last_error_number=2;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_connection_status'
+UPDATE performance_schema.replication_connection_status
+SET last_error_number=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_connection_status'
+UPDATE performance_schema.replication_connection_status
+SET thread_id=12 WHERE received_transaction_set like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_connection_status'
+DELETE FROM performance_schema.replication_connection_status
+WHERE last_error_number=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_connection_status'
+DELETE FROM performance_schema.replication_connection_status;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_connection_status'
+LOCK TABLES performance_schema.replication_connection_status READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_connection_status'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.replication_connection_status WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_connection_status'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_group_member_stats.result b/mysql-test/suite/perfschema/r/dml_replication_group_member_stats.result
new file mode 100644
index 00000000000..f2d67f16734
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_replication_group_member_stats.result
@@ -0,0 +1,26 @@
+SELECT * FROM performance_schema.replication_group_member_stats
+LIMIT 1;
+CHANNEL_NAME	VIEW_ID	MEMBER_ID	COUNT_TRANSACTIONS_IN_QUEUE	COUNT_TRANSACTIONS_CHECKED	COUNT_CONFLICTS_DETECTED	COUNT_TRANSACTIONS_ROWS_VALIDATING	TRANSACTIONS_COMMITTED_ALL_MEMBERS	LAST_CONFLICT_FREE_TRANSACTION
+SELECT * FROM performance_schema.replication_group_member_stats
+WHERE channel_name='FOO';
+CHANNEL_NAME	VIEW_ID	MEMBER_ID	COUNT_TRANSACTIONS_IN_QUEUE	COUNT_TRANSACTIONS_CHECKED	COUNT_CONFLICTS_DETECTED	COUNT_TRANSACTIONS_ROWS_VALIDATING	TRANSACTIONS_COMMITTED_ALL_MEMBERS	LAST_CONFLICT_FREE_TRANSACTION
+INSERT INTO performance_schema.replication_group_member_stats
+SET channel_name='FOO', node_id=1;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_group_member_stats'
+UPDATE performance_schema.replication_group_member_stats
+SET member_id=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_group_member_stats'
+UPDATE performance_schema.replication_group_member_stats
+SET member_id=12 WHERE group_name LIKE "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_group_member_stats'
+DELETE FROM performance_schema.replication_group_member_stats
+WHERE member_id=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_group_member_stats'
+DELETE FROM performance_schema.replication_group_member_stats;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_group_member_stats'
+LOCK TABLES performance_schema.replication_group_member_stats READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_group_member_stats'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.replication_group_member_stats WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_group_member_stats'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_replication_group_members.result b/mysql-test/suite/perfschema/r/dml_replication_group_members.result
new file mode 100644
index 00000000000..cdc211b9978
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_replication_group_members.result
@@ -0,0 +1,24 @@
+SELECT * FROM performance_schema.replication_group_members
+LIMIT 1;
+SELECT * FROM performance_schema.replication_group_members
+WHERE channel_name='FOO';
+INSERT INTO performance_schema.replication_group_members
+SET channel_name='FOO', member_id=1;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'replication_group_members'
+UPDATE performance_schema.replication_group_members
+SET member_id=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_group_members'
+UPDATE performance_schema.replication_group_members
+SET member_id=12 WHERE channel_name LIKE "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'replication_group_members'
+DELETE FROM performance_schema.replication_group_members
+WHERE member_id=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_group_members'
+DELETE FROM performance_schema.replication_group_members;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'replication_group_members'
+LOCK TABLES performance_schema.replication_group_members READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_group_members'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.replication_group_members WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'replication_group_members'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_session_status.result b/mysql-test/suite/perfschema/r/dml_session_status.result
new file mode 100644
index 00000000000..979d97daa83
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_session_status.result
@@ -0,0 +1,21 @@
+select * from performance_schema.session_status
+where variable_name like 'bytes_%' limit 1;
+select * from performance_schema.session_status
+where variable_name='FOO';
+insert into performance_schema.session_status
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'session_status'
+update performance_schema.session_status
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_status'
+delete from performance_schema.session_status
+where variable_name <> 'FOO';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_status'
+delete from performance_schema.session_status;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_status'
+LOCK TABLES performance_schema.session_status READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_status'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.session_status WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_status'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_session_variables.result b/mysql-test/suite/perfschema/r/dml_session_variables.result
new file mode 100644
index 00000000000..c8933a383ce
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_session_variables.result
@@ -0,0 +1,21 @@
+select * from performance_schema.session_variables
+where variable_name like 'bytes_%' limit 1;
+select * from performance_schema.session_variables
+where variable_name='FOO';
+insert into performance_schema.session_variables
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'session_variables'
+update performance_schema.session_variables
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'session_variables'
+delete from performance_schema.session_variables
+where variable_name <> 'FOO';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_variables'
+delete from performance_schema.session_variables;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'session_variables'
+LOCK TABLES performance_schema.session_variables READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_variables'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.session_variables WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'session_variables'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_actors.result b/mysql-test/suite/perfschema/r/dml_setup_actors.result
index 2d12300b7be..36be88fe850 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_actors.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_actors.result
@@ -1,12 +1,18 @@
 drop table if exists test.setup_actors;
 create table test.setup_actors as
 select * from performance_schema.setup_actors;
+insert into performance_schema.setup_actors
+values ('%','%','%','YES', 'YES');
+ERROR 23000: Can't write; duplicate key in table 'setup_actors'
+insert into performance_schema.setup_actors
+values ('%','%','%','NO', 'NO');
+ERROR 23000: Can't write; duplicate key in table 'setup_actors'
 truncate table performance_schema.setup_actors;
 select * from performance_schema.setup_actors;
-HOST	USER	ROLE
+HOST	USER	ROLE	ENABLED	HISTORY
 select * from performance_schema.setup_actors
 where user = '%';
-HOST	USER	ROLE
+HOST	USER	ROLE	ENABLED	HISTORY
 insert into performance_schema.setup_actors
 set user='Joe', host='localhost';
 insert into performance_schema.setup_actors
@@ -15,13 +21,19 @@ insert into performance_schema.setup_actors
 set user='%', host='server1';
 insert into performance_schema.setup_actors
 set user='%', host='%';
+insert into performance_schema.setup_actors
+values ('localhost', 'user1', '%', 'NO%', 'NO');
+ERROR 01000: Data truncated for column 'ENABLED' at row 1
+insert into performance_schema.setup_actors
+values ('localhost', 'user1', '%', 'NO', 'KO');
+ERROR 01000: Data truncated for column 'HISTORY' at row 1
 select * from performance_schema.setup_actors
 order by USER, HOST;
-HOST	USER	ROLE
-%	%	%
-server1	%	%
-%	Joe	%
-localhost	Joe	%
+HOST	USER	ROLE	ENABLED	HISTORY
+%	%	%	YES	YES
+server1	%	%	YES	YES
+%	Joe	%	YES	YES
+localhost	Joe	%	YES	YES
 update performance_schema.setup_actors
 set user='ILLEGAL';
 ERROR HY000: Invalid performance_schema usage
@@ -31,29 +43,61 @@ ERROR HY000: Invalid performance_schema usage
 update performance_schema.setup_actors
 set role='ILLEGAL';
 ERROR HY000: Invalid performance_schema usage
+update performance_schema.setup_actors
+set ENABLED='YES';
+update performance_schema.setup_actors
+set HISTORY='YES';
+update performance_schema.setup_actors
+set ENABLED='';
+ERROR 01000: Data truncated for column 'ENABLED' at row 1
+update performance_schema.setup_actors
+set ENABLED='YESS';
+ERROR 01000: Data truncated for column 'ENABLED' at row 1
+update performance_schema.setup_actors
+set ENABLED='NO%';
+ERROR 01000: Data truncated for column 'ENABLED' at row 1
+update performance_schema.setup_actors
+set ENABLED=NULL;
+ERROR 23000: Column 'ENABLED' cannot be null
+update performance_schema.setup_actors
+set HISTORY='YESS';
+ERROR 01000: Data truncated for column 'HISTORY' at row 1
+update performance_schema.setup_actors
+set HISTORY='NO%';
+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
 select * from performance_schema.setup_actors
 order by USER, HOST;
-HOST	USER	ROLE
-%	%	%
-server1	%	%
-%	Joe	%
-localhost	Joe	%
+HOST	USER	ROLE	ENABLED	HISTORY
+%	%	%	YES	YES
+server1	%	%	YES	YES
+%	Joe	%	YES	YES
+localhost	Joe	%	YES	YES
 delete from performance_schema.setup_actors
 where user = 'Joe' and host = 'localhost';
 select * from performance_schema.setup_actors
 order by USER, HOST;
-HOST	USER	ROLE
-%	%	%
-server1	%	%
-%	Joe	%
+HOST	USER	ROLE	ENABLED	HISTORY
+%	%	%	YES	YES
+server1	%	%	YES	YES
+%	Joe	%	YES	YES
 delete from performance_schema.setup_actors;
 select * from performance_schema.setup_actors
 order by USER, HOST;
-HOST	USER	ROLE
+HOST	USER	ROLE	ENABLED	HISTORY
 LOCK TABLES performance_schema.setup_actors READ;
 UNLOCK TABLES;
 LOCK TABLES performance_schema.setup_actors WRITE;
 UNLOCK TABLES;
+#
+# WL#2284: Increase the length of a user name
+#
+insert into performance_schema.setup_actors
+set user='user_name_len_22_01234', host='localhost';
+delete from performance_schema.setup_actors
+where user = 'user_name_len_22_01234' and host = 'localhost';
 truncate table performance_schema.setup_actors;
 insert into performance_schema.setup_actors
 select * from test.setup_actors;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_consumers.result b/mysql-test/suite/perfschema/r/dml_setup_consumers.result
index 8a1efeb455e..57cd744d85c 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_consumers.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_consumers.result
@@ -6,6 +6,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -25,6 +28,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
diff --git a/mysql-test/suite/perfschema/r/dml_setup_instruments.result b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
index a972cf02285..27b744977dd 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_instruments.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_instruments.result
@@ -34,8 +34,11 @@ wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for	YES	YES
 select * from performance_schema.setup_instruments
 where name like 'Wait/Synch/Cond/sql/%'
   and name not in (
+'wait/synch/cond/sql/COND_open',
 'wait/synch/cond/sql/COND_handler_count',
-'wait/synch/cond/sql/DEBUG_SYNC::cond')
+'wait/synch/cond/sql/DEBUG_SYNC::cond',
+'wait/synch/cond/sql/COND_socket_listener_active',
+'wait/synch/cond/sql/COND_start_signal_handler')
 order by name limit 10;
 NAME	ENABLED	TIMED
 wait/synch/cond/sql/Ack_receiver::cond	YES	YES
@@ -80,3 +83,5 @@ UNLOCK TABLES;
 
 UPDATE performance_schema.setup_instruments SET timed='NO'
 ORDER BY RAND();
+update performance_schema.setup_instruments
+set enabled='YES', TIMED='YES';
diff --git a/mysql-test/suite/perfschema/r/dml_setup_objects.result b/mysql-test/suite/perfschema/r/dml_setup_objects.result
index a505501c8b6..f1ad2ff68a0 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_objects.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_objects.result
@@ -1,4 +1,5 @@
 drop table if exists test.setup_objects;
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
 create table test.setup_objects as
 select * from performance_schema.setup_objects;
 truncate table performance_schema.setup_objects;
@@ -68,3 +69,4 @@ truncate table performance_schema.setup_objects;
 insert into performance_schema.setup_objects
 select * from test.setup_objects;
 drop table test.setup_objects;
+SET sql_mode = default;
diff --git a/mysql-test/suite/perfschema/r/dml_setup_timers.result b/mysql-test/suite/perfschema/r/dml_setup_timers.result
index 60792998359..ed6d30bab10 100644
--- a/mysql-test/suite/perfschema/r/dml_setup_timers.result
+++ b/mysql-test/suite/perfschema/r/dml_setup_timers.result
@@ -1,25 +1,44 @@
 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
 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";
+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='MICROSECOND' where name="transaction";
+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='MICROSECOND' where name="idle";
+Warnings:
+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
 wait	CYCLE
 stage	NANOSECOND
 statement	NANOSECOND
+transaction	MICROSECOND
+Warnings:
+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
 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
 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'
@@ -28,14 +47,21 @@ set name='FOO';
 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
 select * from performance_schema.setup_timers;
 NAME	TIMER_NAME
 idle	MILLISECOND
 wait	MILLISECOND
 stage	MILLISECOND
 statement	MILLISECOND
+transaction	MILLISECOND
+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='CYCLE';
+Warnings:
+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
@@ -47,15 +73,30 @@ LOCK TABLES performance_schema.setup_timers WRITE;
 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
 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";
+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='MICROSECOND' where name="transaction";
+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='MICROSECOND' where name="idle";
+Warnings:
+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
 wait	CYCLE
 stage	NANOSECOND
 statement	NANOSECOND
+transaction	MICROSECOND
+Warnings:
+Warning	1681	'performance_schema.setup_timers' is deprecated and will be removed in a future release
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_account.result b/mysql-test/suite/perfschema/r/dml_status_by_account.result
new file mode 100644
index 00000000000..1b45920c70b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_status_by_account.result
@@ -0,0 +1,24 @@
+select * from performance_schema.status_by_account
+where variable_name like 'bytes_%' limit 1;
+select * from performance_schema.status_by_account
+where variable_name='FOO';
+insert into performance_schema.status_by_account
+set user='USER', host='HOST', variable_name='FOO', variable_value='BAR';
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_account'
+update performance_schema.status_by_account
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_account'
+update performance_schema.status_by_account
+set variable_name='FOO' where user <> 'USER';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_account'
+delete from performance_schema.status_by_account
+where user <> 'USER';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_account'
+delete from performance_schema.status_by_account;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_account'
+LOCK TABLES performance_schema.status_by_account READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_account'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.status_by_account WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_account'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_host.result b/mysql-test/suite/perfschema/r/dml_status_by_host.result
new file mode 100644
index 00000000000..cfe74eaabbf
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_status_by_host.result
@@ -0,0 +1,24 @@
+select * from performance_schema.status_by_host
+where variable_name like 'bytes_%' limit 1;
+select * from performance_schema.status_by_host
+where variable_name='FOO';
+insert into performance_schema.status_by_host
+set host='HOST', variable_name='FOO', variable_value='BAR';
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_host'
+update performance_schema.status_by_host
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_host'
+update performance_schema.status_by_host
+set variable_name='FOO' where host <> 'HOST';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_host'
+delete from performance_schema.status_by_host
+where host <> 'HOST';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_host'
+delete from performance_schema.status_by_host;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_host'
+LOCK TABLES performance_schema.status_by_host READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_host'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.status_by_host WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_host'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_thread.result b/mysql-test/suite/perfschema/r/dml_status_by_thread.result
new file mode 100644
index 00000000000..afe2cf407ed
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_status_by_thread.result
@@ -0,0 +1,24 @@
+select * from performance_schema.status_by_thread
+where variable_name like 'bytes_%' limit 1;
+select * from performance_schema.status_by_thread
+where variable_name='FOO';
+insert into performance_schema.status_by_thread
+set thread_id=1, variable_name='FOO', variable_value='BAR';
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_thread'
+update performance_schema.status_by_thread
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_thread'
+update performance_schema.status_by_thread
+set variable_name='FOO' where thread_id=0;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_thread'
+delete from performance_schema.status_by_thread
+where thread_id=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_thread'
+delete from performance_schema.status_by_thread;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_thread'
+LOCK TABLES performance_schema.status_by_thread READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_thread'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.status_by_thread WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_thread'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_status_by_user.result b/mysql-test/suite/perfschema/r/dml_status_by_user.result
new file mode 100644
index 00000000000..430bb622d3b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_status_by_user.result
@@ -0,0 +1,24 @@
+select * from performance_schema.status_by_user
+where variable_name like 'bytes_%' limit 1;
+select * from performance_schema.status_by_user
+where variable_name='FOO';
+insert into performance_schema.status_by_user
+set user='USER', variable_name='FOO', variable_value='BAR';
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'status_by_user'
+update performance_schema.status_by_user
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_user'
+update performance_schema.status_by_user
+set variable_name='FOO' where user <> 'USER';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'status_by_user'
+delete from performance_schema.status_by_user
+where user <> 'USER';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_user'
+delete from performance_schema.status_by_user;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'status_by_user'
+LOCK TABLES performance_schema.status_by_user READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_user'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.status_by_user WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'status_by_user'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_table_handles.result b/mysql-test/suite/perfschema/r/dml_table_handles.result
new file mode 100644
index 00000000000..5f6f0a43ad8
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_table_handles.result
@@ -0,0 +1,21 @@
+select * from performance_schema.table_handles;
+select * from performance_schema.table_handles
+where object_name='foo';
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	OWNER_THREAD_ID	OWNER_EVENT_ID	INTERNAL_LOCK	EXTERNAL_LOCK
+insert into performance_schema.table_handles
+set object_name='FOO', owner_event_id=1;
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'table_handles'
+update performance_schema.table_handles
+set owner_event_id=12 where object_name='foo';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'table_handles'
+delete from performance_schema.table_handles;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_handles'
+delete from performance_schema.table_handles
+where timer_name='CYCLE';
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'table_handles'
+LOCK TABLES performance_schema.table_handles READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_handles'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.table_handles WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'table_handles'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result b/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result
new file mode 100644
index 00000000000..ae6dc4ec3d9
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_uvar_by_thread.result
@@ -0,0 +1,30 @@
+select * from performance_schema.user_variables_by_thread
+where variable_name like 'foo%' limit 1;
+select * from performance_schema.user_variables_by_thread
+where variable_name='FOO';
+insert into performance_schema.user_variables_by_thread
+set thread_id=12, variable_name='foo', variable_value='bar';
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+update performance_schema.user_variables_by_thread
+set thread_id=12;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+update performance_schema.user_variables_by_thread
+set thread_id=12 where variable_name like "FOO";
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+delete from performance_schema.user_variables_by_thread
+where thread_id=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+delete from performance_schema.user_variables_by_thread;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+LOCK TABLES performance_schema.user_variables_by_thread READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.user_variables_by_thread WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'user_variables_by_thread'
+UNLOCK TABLES;
+CREATE TRIGGER test_uvar_trigger
+AFTER INSERT ON performance_schema.user_variables_by_thread
+FOR EACH ROW BEGIN
+set @a='OK';
+END|
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
diff --git a/mysql-test/suite/perfschema/r/dml_variables_by_thread.result b/mysql-test/suite/perfschema/r/dml_variables_by_thread.result
new file mode 100644
index 00000000000..b98907b3ba8
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/dml_variables_by_thread.result
@@ -0,0 +1,24 @@
+select * from performance_schema.variables_by_thread
+where variable_name like 'autocommit%' limit 1;
+select * from performance_schema.variables_by_thread
+where variable_name='FOO';
+insert into performance_schema.variables_by_thread
+set thread_id=1, variable_name='FOO', variable_value='BAR';
+ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'variables_by_thread'
+update performance_schema.variables_by_thread
+set variable_name='FOO', variable_value='BAR';
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'variables_by_thread'
+update performance_schema.variables_by_thread
+set variable_name='FOO' where thread_id=0;
+ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'variables_by_thread'
+delete from performance_schema.variables_by_thread
+where thread_id=1;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'variables_by_thread'
+delete from performance_schema.variables_by_thread;
+ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'variables_by_thread'
+LOCK TABLES performance_schema.variables_by_thread READ;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'variables_by_thread'
+UNLOCK TABLES;
+LOCK TABLES performance_schema.variables_by_thread WRITE;
+ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'variables_by_thread'
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/r/event_aggregate.result b/mysql-test/suite/perfschema/r/event_aggregate.result
index 23f88479a94..2582262c8c4 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate.result
@@ -15,12 +15,10 @@ 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_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	0
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -30,18 +28,18 @@ 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)
 execute dump_statements_account;
@@ -52,16 +50,30 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -77,7 +89,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -88,82 +99,96 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	1
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 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
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 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
-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	1
-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	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;
 event_name	count(event_name)
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -176,19 +201,23 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user2	not found
@@ -198,91 +227,107 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	4
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	7
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	4
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
+localhost	stage/sql/checking permissions	4
+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	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	1
 localhost	statement/sql/insert	1
-localhost	statement/sql/select	2
+localhost	statement/sql/select	3
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	1
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -299,12 +344,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -312,115 +355,133 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user2	localhost	wait/io/file/sql/query_log	1
-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
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 user2	wait/io/file/sql/query_log	1
-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
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	8
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	5
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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
 user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	0
 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	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	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
 user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
 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
+localhost	stage/sql/checking permissions	4
+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	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	1
 localhost	statement/sql/insert	1
-localhost	statement/sql/select	2
+localhost	statement/sql/select	3
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	1
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -435,23 +496,26 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user3	not found
@@ -459,115 +523,133 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	8
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	14
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	8
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	8
+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	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	2
 localhost	statement/sql/insert	2
-localhost	statement/sql/select	4
+localhost	statement/sql/select	6
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	2
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -586,154 +668,171 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	1
-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
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	1
-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
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	15
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	9
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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
 user3	localhost	stage/sql/Opening tables	0
+user3	localhost	stage/sql/starting	0
 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	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	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	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
 user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
 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
+localhost	stage/sql/checking permissions	8
+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	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	2
 localhost	statement/sql/insert	2
-localhost	statement/sql/select	4
+localhost	statement/sql/select	6
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	2
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -750,165 +849,187 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	12
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	21
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	12
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	12
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	12
+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	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	3
 localhost	statement/sql/insert	3
-localhost	statement/sql/select	6
+localhost	statement/sql/select	9
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	3
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -929,180 +1050,198 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-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
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	1
-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
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	1
-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
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	22
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	13
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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
 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	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	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	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	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
 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	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
+localhost	stage/sql/checking permissions	12
+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	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	3
 localhost	statement/sql/insert	3
-localhost	statement/sql/select	6
+localhost	statement/sql/select	9
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	3
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1121,191 +1260,214 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	5	5
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	16
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	28
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	16
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	24
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1330,177 +1492,196 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	17
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	29
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	17
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	17
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	25
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	1
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1527,173 +1708,193 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	18
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	30
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	18
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	18
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	26
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	2
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1722,169 +1923,190 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	19
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	31
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	19
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	19
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	27
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	3
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1916,164 +2138,186 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2106,164 +2350,186 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2296,163 +2562,185 @@ 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_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	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2485,163 +2773,185 @@ 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_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	0
-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
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2674,163 +2984,185 @@ 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_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	0
-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	0
-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
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2863,163 +3195,185 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3052,163 +3406,185 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3241,163 +3617,185 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3430,163 +3828,185 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3619,163 +4039,185 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3808,163 +4250,185 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3997,163 +4461,185 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4186,163 +4672,185 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4375,163 +4883,185 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4564,163 +5094,185 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4753,163 +5305,1240 @@ 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_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	0
-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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+"================== TRANSACTIONS_BY_THREAD truncated =================="
+"================== Step 29 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+"================== TRANSACTIONS_BY_ACCOUNT truncated =================="
+"================== Step 30 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+"================== TRANSACTIONS_BY_USER truncated =================="
+"================== Step 31 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+"================== TRANSACTIONS_BY_HOST truncated =================="
+"================== Step 32 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+"================== TRANSACTIONS_GLOBAL truncated =================="
+"================== Step 33 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4929,7 +6558,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.accounts;
 "================== ACCOUNTS truncated =================="
-"================== Step 29 =================="
+"================== Step 34 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -4944,113 +6573,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5066,7 +6713,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.users;
 "================== USERS truncated =================="
-"================== Step 30 =================="
+"================== Step 35 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -5083,16 +6730,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -5100,25 +6745,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5127,19 +6772,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5151,7 +6812,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.hosts;
 "================== HOSTS truncated =================="
-"================== Step 31 =================="
+"================== Step 36 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -5168,16 +6829,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -5185,25 +6844,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -5212,19 +6871,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
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 32bf988e63a..b67cd3ee31c 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
@@ -15,12 +15,10 @@ 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_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	0
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -30,18 +28,18 @@ 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)
 execute dump_statements_account;
@@ -52,16 +50,30 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -76,7 +88,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -89,17 +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
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 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
-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	1
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -108,25 +116,25 @@ 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;
 event_name	count(event_name)
 execute dump_statements_account;
@@ -135,22 +143,38 @@ execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -161,19 +185,23 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user2	not found
@@ -185,77 +213,92 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	4
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	7
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	4
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
+wait/io/file/sql/query_log	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
-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	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	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
+localhost	stage/sql/checking permissions	4
+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	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	1
 localhost	statement/sql/insert	1
-localhost	statement/sql/select	2
+localhost	statement/sql/select	3
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	1
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -270,12 +313,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -285,89 +326,105 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 user2	wait/io/file/sql/query_log	1
-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
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	8
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	5
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
+wait/io/file/sql/query_log	8
 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
-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	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
 user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
 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
+localhost	stage/sql/checking permissions	4
+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	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	1
 localhost	statement/sql/insert	1
-localhost	statement/sql/select	2
+localhost	statement/sql/select	3
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	1
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -379,23 +436,26 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user3	not found
@@ -405,89 +465,105 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	8
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	14
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	8
+wait/io/file/sql/query_log	14
 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
-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	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	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	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
+localhost	stage/sql/checking permissions	8
+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	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	2
 localhost	statement/sql/insert	2
-localhost	statement/sql/select	4
+localhost	statement/sql/select	6
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	2
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -503,16 +579,13 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -520,101 +593,118 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	1
-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
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	15
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	9
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
+wait/io/file/sql/query_log	15
 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
-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	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	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
 user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
 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
+localhost	stage/sql/checking permissions	8
+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	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	2
 localhost	statement/sql/insert	2
-localhost	statement/sql/select	4
+localhost	statement/sql/select	6
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	2
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -627,27 +717,29 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user4	not found
@@ -655,101 +747,118 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	12
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	21
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	12
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	12
+wait/io/file/sql/query_log	21
 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
-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	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	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	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	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
+localhost	stage/sql/checking permissions	12
+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	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	3
 localhost	statement/sql/insert	3
-localhost	statement/sql/select	6
+localhost	statement/sql/select	9
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	3
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -766,132 +875,146 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-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
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	1
-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
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	22
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	13
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
+wait/io/file/sql/query_log	22
 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
-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	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	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	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
 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	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
+localhost	stage/sql/checking permissions	12
+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	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	3
 localhost	statement/sql/insert	3
-localhost	statement/sql/select	6
+localhost	statement/sql/select	9
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	3
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -905,143 +1028,162 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	5	5
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	16
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	28
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	16
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
+wait/io/file/sql/query_log	28
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	24
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1061,129 +1203,144 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	17
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	29
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	17
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	17
+wait/io/file/sql/query_log	29
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	25
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	1
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1205,125 +1362,141 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	18
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	30
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	18
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	18
+wait/io/file/sql/query_log	30
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	26
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	2
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1347,121 +1520,138 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	19
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	31
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	19
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	19
+wait/io/file/sql/query_log	31
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	27
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	3
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1490,114 +1680,132 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1627,114 +1835,132 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1763,114 +1989,132 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1900,113 +2144,131 @@ 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_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
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2036,113 +2298,131 @@ 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_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	0
-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
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2172,113 +2452,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2308,113 +2606,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2444,113 +2760,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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	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	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	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	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	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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2580,113 +2914,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2716,113 +3068,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2852,113 +3222,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2988,113 +3376,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3124,113 +3530,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3260,113 +3684,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3396,113 +3838,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3532,113 +3992,901 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
+execute dump_statements_account;
+user	host	event_name	count_star
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+"================== TRANSACTIONS_BY_THREAD truncated =================="
+"================== Step 29 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+"================== TRANSACTIONS_BY_ACCOUNT truncated =================="
+"================== Step 30 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+"================== TRANSACTIONS_BY_USER truncated =================="
+"================== Step 31 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+"================== TRANSACTIONS_BY_HOST truncated =================="
+"================== Step 32 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+"================== TRANSACTIONS_GLOBAL truncated =================="
+"================== Step 33 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3653,7 +4901,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.accounts;
 "================== ACCOUNTS truncated =================="
-"================== Step 29 =================="
+"================== Step 34 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3668,113 +4916,131 @@ 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_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	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3789,7 +5055,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.users;
 "================== USERS truncated =================="
-"================== Step 30 =================="
+"================== Step 35 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3806,16 +5072,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3823,25 +5087,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3850,19 +5114,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3873,7 +5153,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.hosts;
 "================== HOSTS truncated =================="
-"================== Step 31 =================="
+"================== Step 36 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3890,16 +5170,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3907,25 +5185,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3934,19 +5212,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
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 b172ab33969..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
@@ -17,7 +17,6 @@ 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_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -29,11 +28,11 @@ 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)
 execute dump_statements_account;
@@ -46,10 +45,22 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -63,7 +74,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -76,14 +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
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 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
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -92,20 +100,20 @@ 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;
 event_name	count(event_name)
 execute dump_statements_account;
@@ -114,6 +122,7 @@ execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 execute dump_statements_host;
@@ -122,10 +131,23 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -135,19 +157,23 @@ user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user2	not found
@@ -159,65 +185,79 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	4
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
+wait/io/file/sql/query_log	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
-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	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
 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
+stage/sql/checking permissions	4
+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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -231,12 +271,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -246,63 +284,62 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 user2	wait/io/file/sql/query_log	1
-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
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	5
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
+wait/io/file/sql/query_log	8
 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
-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	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
 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
-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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 execute dump_statements_host;
@@ -311,12 +348,28 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -327,23 +380,26 @@ user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user3	not found
@@ -353,77 +409,92 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	8
+wait/io/file/sql/query_log	14
 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
-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	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	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
 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
+stage/sql/checking permissions	8
+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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -438,16 +509,13 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -455,75 +523,74 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	1
-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
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	9
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
+wait/io/file/sql/query_log	15
 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
-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	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	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
 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
-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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 execute dump_statements_host;
@@ -532,12 +599,29 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -549,27 +633,29 @@ user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user4	not found
@@ -577,89 +663,105 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	12
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	12
+wait/io/file/sql/query_log	21
 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
-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	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	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	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
 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
+stage/sql/checking permissions	12
+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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -675,106 +777,101 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-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
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	1
-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
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	13
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
+wait/io/file/sql/query_log	22
 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
-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	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	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	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
 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	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
@@ -783,12 +880,30 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -801,131 +916,149 @@ user4	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	16
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
+wait/io/file/sql/query_log	28
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	24
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -944,117 +1077,131 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	17
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	17
+wait/io/file/sql/query_log	29
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	25
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1075,113 +1222,128 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	18
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	18
+wait/io/file/sql/query_log	30
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	26
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1204,109 +1366,125 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	19
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	19
+wait/io/file/sql/query_log	31
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	27
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1334,102 +1512,119 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1458,102 +1653,119 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1581,102 +1793,119 @@ execute dump_waits_account;
 user	host	event_name	count_star
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1705,101 +1934,118 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1828,101 +2074,118 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1951,101 +2214,118 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2074,101 +2354,118 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2197,101 +2494,118 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2320,101 +2634,118 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2443,101 +2774,118 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2566,101 +2914,118 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2689,101 +3054,118 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2812,101 +3194,118 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2935,86 +3334,85 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
@@ -3023,13 +3421,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3058,86 +3474,85 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
@@ -3146,13 +3561,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3181,86 +3614,225 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
+execute dump_statements_account;
+user	host	event_name	count_star
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+"================== TRANSACTIONS_BY_THREAD truncated =================="
+"================== Step 29 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
@@ -3269,13 +3841,591 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+"================== TRANSACTIONS_BY_ACCOUNT truncated =================="
+"================== Step 30 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+"================== TRANSACTIONS_BY_USER truncated =================="
+"================== Step 31 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+"================== TRANSACTIONS_BY_HOST truncated =================="
+"================== Step 32 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+"================== TRANSACTIONS_GLOBAL truncated =================="
+"================== Step 33 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3289,7 +4439,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.accounts;
 "================== ACCOUNTS truncated =================="
-"================== Step 29 =================="
+"================== Step 34 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3304,86 +4454,85 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
@@ -3392,13 +4541,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3412,7 +4579,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.users;
 "================== USERS truncated =================="
-"================== Step 30 =================="
+"================== Step 35 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3431,11 +4598,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3445,18 +4611,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3467,13 +4633,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3483,7 +4663,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.hosts;
 "================== HOSTS truncated =================="
-"================== Step 31 =================="
+"================== Step 36 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3502,11 +4682,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3516,18 +4695,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3538,13 +4717,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
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 1ac9fc38274..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
@@ -15,12 +15,10 @@ 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_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	0
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -30,18 +28,18 @@ 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)
 execute dump_statements_account;
@@ -52,16 +50,30 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -75,7 +87,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -90,12 +101,10 @@ user	event_name	count_star
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	1
-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	1
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -106,18 +115,18 @@ 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)
 execute dump_statements_account;
@@ -128,16 +137,30 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -146,19 +169,23 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user2	not found
@@ -172,17 +199,15 @@ 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	4
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	7
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	4
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -190,25 +215,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	3
-localhost	stage/sql/Closing tables	6
-localhost	stage/sql/Init	5
-localhost	stage/sql/Init for update	1
-localhost	stage/sql/Opening tables	4
+localhost	stage/sql/checking permissions	4
+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	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -217,18 +242,34 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	1
 localhost	statement/sql/insert	1
-localhost	statement/sql/select	2
+localhost	statement/sql/select	3
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	1
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -241,12 +282,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -258,17 +297,15 @@ 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	5
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	8
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	5
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -276,25 +313,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	3
-localhost	stage/sql/Closing tables	6
-localhost	stage/sql/Init	5
-localhost	stage/sql/Init for update	1
-localhost	stage/sql/Opening tables	4
+localhost	stage/sql/checking permissions	4
+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	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -303,18 +340,34 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	1
 localhost	statement/sql/insert	1
-localhost	statement/sql/select	2
+localhost	statement/sql/select	3
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	1
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -323,23 +376,26 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user3	not found
@@ -351,17 +407,15 @@ 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	8
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	14
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	8
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -369,25 +423,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	6
-localhost	stage/sql/Closing tables	10
-localhost	stage/sql/Init	10
-localhost	stage/sql/Init for update	2
-localhost	stage/sql/Opening tables	7
+localhost	stage/sql/checking permissions	8
+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	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -396,18 +450,34 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	2
 localhost	statement/sql/insert	2
-localhost	statement/sql/select	4
+localhost	statement/sql/select	6
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	2
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -420,16 +490,13 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -439,17 +506,15 @@ 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	9
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	15
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	9
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -457,25 +522,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	6
-localhost	stage/sql/Closing tables	10
-localhost	stage/sql/Init	10
-localhost	stage/sql/Init for update	2
-localhost	stage/sql/Opening tables	7
+localhost	stage/sql/checking permissions	8
+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	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -484,18 +549,34 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	2
 localhost	statement/sql/insert	2
-localhost	statement/sql/select	4
+localhost	statement/sql/select	6
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	2
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -504,27 +585,29 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user4	not found
@@ -534,17 +617,15 @@ 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	12
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	21
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	12
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	12
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -552,25 +633,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	9
-localhost	stage/sql/Closing tables	14
-localhost	stage/sql/Init	15
-localhost	stage/sql/Init for update	3
-localhost	stage/sql/Opening tables	10
+localhost	stage/sql/checking permissions	12
+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	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -579,18 +660,34 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	3
 localhost	statement/sql/insert	3
-localhost	statement/sql/select	6
+localhost	statement/sql/select	9
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	3
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -603,20 +700,16 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-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
@@ -624,17 +717,15 @@ 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	13
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	22
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	13
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -642,25 +733,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	9
-localhost	stage/sql/Closing tables	14
-localhost	stage/sql/Init	15
-localhost	stage/sql/Init for update	3
-localhost	stage/sql/Opening tables	10
+localhost	stage/sql/checking permissions	12
+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	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -669,18 +760,34 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	3
 localhost	statement/sql/insert	3
-localhost	statement/sql/select	6
+localhost	statement/sql/select	9
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	3
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -689,31 +796,32 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	5	5
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
@@ -721,17 +829,15 @@ 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	16
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	28
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	16
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -739,25 +845,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	20
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	24
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -766,18 +872,34 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -792,16 +914,13 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
@@ -809,17 +928,15 @@ 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	17
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	29
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	17
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	17
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -827,25 +944,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	21
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	25
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -854,19 +971,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	1
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -883,12 +1016,10 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
@@ -896,17 +1027,15 @@ 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	18
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	30
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	18
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	18
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -914,25 +1043,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	22
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	26
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -941,19 +1070,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	2
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -972,8 +1117,7 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
@@ -981,17 +1125,15 @@ 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	19
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	31
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	19
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	19
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -999,25 +1141,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	23
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	27
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1026,19 +1168,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	3
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1064,17 +1222,15 @@ 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	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1082,25 +1238,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1109,19 +1265,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1148,17 +1320,15 @@ 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	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1166,25 +1336,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1193,19 +1363,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1231,17 +1417,15 @@ 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	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1249,25 +1433,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1276,19 +1460,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1314,17 +1514,15 @@ 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	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1332,25 +1530,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1359,19 +1557,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1398,16 +1612,14 @@ 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_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
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1415,25 +1627,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1442,19 +1654,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1481,16 +1709,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1498,25 +1724,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1525,19 +1751,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1564,16 +1806,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1581,25 +1821,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1608,19 +1848,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1647,16 +1903,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1664,25 +1918,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1691,19 +1945,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1730,16 +2000,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1747,25 +2015,25 @@ execute dump_stages_user;
 user	event_name	count_star
 execute dump_stages_host;
 host	event_name	count_star
-localhost	stage/sql/Checking permissions	12
-localhost	stage/sql/Closing tables	18
-localhost	stage/sql/Init	24
-localhost	stage/sql/Init for update	4
-localhost	stage/sql/Opening tables	13
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1774,19 +2042,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1813,16 +2097,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1830,25 +2112,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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1857,19 +2139,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1896,16 +2194,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1913,25 +2209,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1940,19 +2236,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1979,16 +2291,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1996,25 +2306,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2023,19 +2333,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2062,16 +2388,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2079,25 +2403,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2106,19 +2430,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2145,16 +2485,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2162,25 +2500,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2189,19 +2527,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2228,16 +2582,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2245,25 +2597,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2272,19 +2624,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2311,16 +2679,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2328,25 +2694,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2355,19 +2721,520 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+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
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+"================== TRANSACTIONS_BY_THREAD truncated =================="
+"================== Step 29 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+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
+localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+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
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+"================== TRANSACTIONS_BY_ACCOUNT truncated =================="
+"================== Step 30 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+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
+localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+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
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+"================== TRANSACTIONS_BY_USER truncated =================="
+"================== Step 31 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+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
+localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+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
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+"================== TRANSACTIONS_BY_HOST truncated =================="
+"================== Step 32 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+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
+localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+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
+localhost	1	5
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+"================== TRANSACTIONS_GLOBAL truncated =================="
+"================== Step 33 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+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
+localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2377,7 +3244,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.accounts;
 "================== ACCOUNTS truncated =================="
-"================== Step 29 =================="
+"================== Step 34 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -2394,16 +3261,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2411,25 +3276,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2438,19 +3303,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2460,7 +3341,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.users;
 "================== USERS truncated =================="
-"================== Step 30 =================="
+"================== Step 35 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -2477,16 +3358,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2494,25 +3373,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2521,19 +3400,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2543,7 +3438,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.hosts;
 "================== HOSTS truncated =================="
-"================== Step 31 =================="
+"================== Step 36 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -2560,16 +3455,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2577,25 +3470,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2604,19 +3497,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
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 4b522c1a5dd..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
@@ -17,7 +17,6 @@ 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_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -29,11 +28,11 @@ 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)
 execute dump_statements_account;
@@ -46,10 +45,22 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -62,7 +73,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -79,7 +89,6 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	1
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -92,11 +101,11 @@ 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)
 execute dump_statements_account;
@@ -109,10 +118,22 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -120,19 +141,23 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user2	not found
@@ -148,12 +173,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	4
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -163,18 +187,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -185,12 +209,26 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -202,12 +240,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -221,12 +257,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	5
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -236,18 +271,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -258,12 +293,26 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -271,23 +320,26 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user3	not found
@@ -301,12 +353,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	8
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -316,18 +367,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -338,12 +389,26 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -355,16 +420,13 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -376,12 +438,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	9
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -391,18 +452,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -413,12 +474,26 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -426,27 +501,29 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user4	not found
@@ -458,12 +535,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	12
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	12
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -473,18 +549,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -495,12 +571,26 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -512,20 +602,16 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-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
@@ -535,12 +621,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	13
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -550,18 +635,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -572,12 +657,26 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -585,31 +684,32 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
@@ -619,12 +719,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	16
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -634,18 +733,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	24
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -656,12 +755,26 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -675,16 +788,13 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
@@ -694,12 +804,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	17
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	17
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -709,18 +818,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	25
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -731,13 +840,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -753,12 +876,10 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
@@ -768,12 +889,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	18
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	18
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -783,18 +903,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	26
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -805,13 +925,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -829,8 +963,7 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
@@ -840,12 +973,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	19
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	19
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -855,18 +987,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	27
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -877,13 +1009,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -910,12 +1056,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -925,18 +1070,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -947,13 +1092,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -981,12 +1140,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -996,18 +1154,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1018,13 +1176,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1051,12 +1223,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1066,18 +1237,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1088,13 +1259,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1121,12 +1306,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1136,18 +1320,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1158,13 +1342,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1191,12 +1389,11 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1206,18 +1403,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1228,13 +1425,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1262,11 +1473,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1276,18 +1486,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1298,13 +1508,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1332,11 +1556,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1346,18 +1569,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1368,13 +1591,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1402,11 +1639,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1416,18 +1652,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1438,13 +1674,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1472,11 +1722,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1486,18 +1735,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1508,13 +1757,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1542,11 +1805,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1556,18 +1818,18 @@ execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1578,13 +1840,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1612,11 +1888,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1626,18 +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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1648,13 +1923,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1682,11 +1971,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1696,18 +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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1718,13 +2006,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1752,11 +2054,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1766,18 +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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1788,13 +2089,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1822,11 +2137,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1836,18 +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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1858,13 +2172,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1892,11 +2220,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1906,18 +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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -1928,13 +2255,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1962,11 +2303,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1976,18 +2316,184 @@ 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
+execute dump_statements_account;
+user	host	event_name	count_star
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+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
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+"================== TRANSACTIONS_BY_THREAD truncated =================="
+"================== Step 29 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+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
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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
+execute dump_stages_global;
+event_name	count_star
+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)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+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
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+"================== TRANSACTIONS_BY_ACCOUNT truncated =================="
+"================== Step 30 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+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
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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
+execute dump_stages_global;
+event_name	count_star
+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)
+stage/sql/checking permissions	16
+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
 execute dump_statements_user;
@@ -1998,13 +2504,276 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+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
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+"================== TRANSACTIONS_BY_USER truncated =================="
+"================== Step 31 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+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
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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
+execute dump_stages_global;
+event_name	count_star
+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)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+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
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+"================== TRANSACTIONS_BY_HOST truncated =================="
+"================== Step 32 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+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
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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
+execute dump_stages_global;
+event_name	count_star
+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)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+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
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+"================== TRANSACTIONS_GLOBAL truncated =================="
+"================== Step 33 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+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
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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
+execute dump_stages_global;
+event_name	count_star
+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)
+stage/sql/checking permissions	16
+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
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2013,7 +2782,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.accounts;
 "================== ACCOUNTS truncated =================="
-"================== Step 29 =================="
+"================== Step 34 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -2032,11 +2801,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2046,18 +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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2068,13 +2836,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2083,7 +2865,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.users;
 "================== USERS truncated =================="
-"================== Step 30 =================="
+"================== Step 35 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -2102,11 +2884,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2116,18 +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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2138,13 +2919,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2153,7 +2948,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.hosts;
 "================== HOSTS truncated =================="
-"================== Step 31 =================="
+"================== Step 36 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -2172,11 +2967,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2186,18 +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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -2208,13 +3002,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
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 3ca29d4d235..a74b0288cd7 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
@@ -17,7 +17,6 @@ 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_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -29,11 +28,11 @@ 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)
 execute dump_statements_account;
@@ -46,10 +45,22 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -64,7 +75,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -75,58 +85,57 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	1
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 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
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 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
-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	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;
 event_name	count(event_name)
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 execute dump_statements_host;
@@ -135,10 +144,24 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -150,19 +173,23 @@ user1	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user2	not found
@@ -172,79 +199,94 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	4
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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
 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
+stage/sql/checking permissions	4
+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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -260,12 +302,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -273,89 +313,88 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user2	localhost	wait/io/file/sql/query_log	1
-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
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 user2	wait/io/file/sql/query_log	1
-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
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	5
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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
 user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	0
 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	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	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
 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
-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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 execute dump_statements_host;
@@ -364,12 +403,30 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -383,23 +440,26 @@ user2	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user3	not found
@@ -407,103 +467,120 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	8
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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
 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
+stage/sql/checking permissions	8
+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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -521,128 +598,124 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	1
-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
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 user3	wait/io/file/sql/query_log	1
-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
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	9
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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
 user3	localhost	stage/sql/Opening tables	0
+user3	localhost	stage/sql/starting	0
 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	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	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	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
 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
-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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 execute dump_statements_host;
@@ -651,12 +724,32 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -672,153 +765,174 @@ user3	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	12
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	12
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	12
+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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -838,154 +952,149 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-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
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	1
-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
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 user4	wait/io/file/sql/query_log	1
-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
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	13
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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
 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	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	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	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	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
 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	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
@@ -994,12 +1103,34 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1017,179 +1148,201 @@ user4	1	1
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	16
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	24
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1213,165 +1366,183 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	17
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	17
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	25
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1397,161 +1568,180 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	18
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	18
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	26
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1579,157 +1769,177 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	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
-wait/io/file/sql/query_log	19
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	19
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	27
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1760,152 +1970,173 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1937,152 +2168,173 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/file/sql/query_log	5
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2114,151 +2366,172 @@ 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_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	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2290,151 +2563,172 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2466,151 +2760,172 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2642,151 +2957,172 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2818,151 +3154,172 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2994,151 +3351,172 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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	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	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	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	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	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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3170,151 +3548,172 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3346,151 +3745,172 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3522,151 +3942,172 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3698,151 +4139,172 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3874,151 +4336,172 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	1
+user1	statement/sp/freturn	1
 user1	statement/sql/insert	1
-user1	statement/sql/select	2
+user1	statement/sql/select	3
 user2	statement/com/Error	0
 user2	statement/com/Quit	1
+user2	statement/sp/freturn	1
 user2	statement/sql/insert	1
-user2	statement/sql/select	2
+user2	statement/sql/select	3
 user3	statement/com/Error	0
 user3	statement/com/Quit	1
+user3	statement/sp/freturn	1
 user3	statement/sql/insert	1
-user3	statement/sql/select	2
+user3	statement/sql/select	3
 user4	statement/com/Error	0
 user4	statement/com/Quit	1
+user4	statement/sp/freturn	1
 user4	statement/sql/insert	1
-user4	statement/sql/select	2
+user4	statement/sql/select	3
 execute dump_statements_host;
 host	event_name	count_star
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4050,136 +4533,135 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
@@ -4188,13 +4670,35 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4226,136 +4730,135 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
@@ -4364,13 +4867,35 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4402,136 +4927,923 @@ 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_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	0
-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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
+execute dump_statements_account;
+user	host	event_name	count_star
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+"================== TRANSACTIONS_BY_THREAD truncated =================="
+"================== Step 29 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+"================== TRANSACTIONS_BY_ACCOUNT truncated =================="
+"================== Step 30 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	1
+user2	transaction	1
+user3	transaction	1
+user4	transaction	1
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+"================== TRANSACTIONS_BY_USER truncated =================="
+"================== Step 31 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+"================== TRANSACTIONS_BY_HOST truncated =================="
+"================== Step 32 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
@@ -4540,13 +5852,232 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+"================== TRANSACTIONS_GLOBAL truncated =================="
+"================== Step 33 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+user2	wait/io/file/sql/query_log	0
+user2	wait/synch/rwlock/sql/LOCK_grant	0
+user3	wait/io/file/sql/query_log	0
+user3	wait/synch/rwlock/sql/LOCK_grant	0
+user4	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_history;
+event_name	count(event_name)
+wait/io/file/sql/query_log	32
+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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/Opening tables	0
+user1	stage/sql/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	0
+user2	stage/sql/Opening tables	0
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	0
+user3	stage/sql/Opening tables	0
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
+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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+user1	statement/com/Error	0
+user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
+user1	statement/sql/insert	0
+user1	statement/sql/select	0
+user2	statement/com/Error	0
+user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
+user2	statement/sql/insert	0
+user2	statement/sql/select	0
+user3	statement/com/Error	0
+user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
+user3	statement/sql/insert	0
+user3	statement/sql/select	0
+user4	statement/com/Error	0
+user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
+user4	statement/sql/insert	0
+user4	statement/sql/select	0
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4565,7 +6096,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.accounts;
 "================== ACCOUNTS truncated =================="
-"================== Step 29 =================="
+"================== Step 34 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -4580,86 +6111,85 @@ 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_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
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	stage/sql/checking permissions	0
+user2	stage/sql/closing tables	0
+user2	stage/sql/init	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
+user2	stage/sql/starting	0
+user3	stage/sql/checking permissions	0
+user3	stage/sql/closing tables	0
+user3	stage/sql/init	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
+user3	stage/sql/starting	0
+user4	stage/sql/checking permissions	0
+user4	stage/sql/closing tables	0
+user4	stage/sql/init	0
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
 user	event_name	count_star
 user1	statement/com/Error	0
 user1	statement/com/Quit	0
+user1	statement/sp/freturn	0
 user1	statement/sql/insert	0
 user1	statement/sql/select	0
 user2	statement/com/Error	0
 user2	statement/com/Quit	0
+user2	statement/sp/freturn	0
 user2	statement/sql/insert	0
 user2	statement/sql/select	0
 user3	statement/com/Error	0
 user3	statement/com/Quit	0
+user3	statement/sp/freturn	0
 user3	statement/sql/insert	0
 user3	statement/sql/select	0
 user4	statement/com/Error	0
 user4	statement/com/Quit	0
+user4	statement/sp/freturn	0
 user4	statement/sql/insert	0
 user4	statement/sql/select	0
 execute dump_statements_host;
@@ -4668,13 +6198,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	0
+user2	transaction	0
+user3	transaction	0
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4689,7 +6237,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.users;
 "================== USERS truncated =================="
-"================== Step 30 =================="
+"================== Step 35 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -4708,11 +6256,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -4722,18 +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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4744,13 +6291,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4761,7 +6322,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.hosts;
 "================== HOSTS truncated =================="
-"================== Step 31 =================="
+"================== Step 36 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -4780,11 +6341,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -4794,18 +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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -4816,13 +6376,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
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 be6f3e272d9..c9c5ed2aebd 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
@@ -15,12 +15,10 @@ 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_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	0
-wait/synch/mutex/sql/LOCK_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -30,18 +28,18 @@ 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)
 execute dump_statements_account;
@@ -52,16 +50,30 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -76,7 +88,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -87,52 +98,50 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	1
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 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
-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	1
-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	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;
 event_name	count(event_name)
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -141,16 +150,31 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -161,19 +185,23 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	2	2
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user2	not found
@@ -183,79 +211,94 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 user1	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
-localhost	wait/io/file/sql/query_log	4
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	7
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	4
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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
 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
+localhost	stage/sql/checking permissions	4
+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	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	1
 localhost	statement/sql/insert	1
-localhost	statement/sql/select	2
+localhost	statement/sql/select	3
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	1
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -270,12 +313,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -283,71 +324,69 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user2	localhost	wait/io/file/sql/query_log	1
-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
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	5
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	8
 localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	5
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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
 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
-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
+localhost	stage/sql/checking permissions	4
+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	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -356,18 +395,36 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	1
 localhost	statement/sql/insert	1
-localhost	statement/sql/select	2
+localhost	statement/sql/select	3
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	1
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -379,23 +436,26 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	3	3
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user3	not found
@@ -403,91 +463,107 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-localhost	wait/io/file/sql/query_log	8
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	14
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	8
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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
 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
+localhost	stage/sql/checking permissions	8
+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	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	2
 localhost	statement/sql/insert	2
-localhost	statement/sql/select	4
+localhost	statement/sql/select	6
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	2
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -503,98 +579,93 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	1
-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
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	9
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	15
 localhost	wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	9
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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
 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
-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
+localhost	stage/sql/checking permissions	8
+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	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -603,18 +674,37 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	2
 localhost	statement/sql/insert	2
-localhost	statement/sql/select	4
+localhost	statement/sql/select	6
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	2
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -627,129 +717,148 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	4	4
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-localhost	wait/io/file/sql/query_log	12
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	21
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	12
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	12
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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
 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
+localhost	stage/sql/checking permissions	12
+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	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	3
 localhost	statement/sql/insert	3
-localhost	statement/sql/select	6
+localhost	statement/sql/select	9
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	3
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -766,112 +875,106 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-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
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	1
-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
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	13
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	22
 localhost	wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	13
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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
 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	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
+localhost	stage/sql/checking permissions	12
+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	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -880,18 +983,38 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	3
 localhost	statement/sql/insert	3
-localhost	statement/sql/select	6
+localhost	statement/sql/select	9
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	3
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -905,143 +1028,162 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	5	5
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-localhost	wait/io/file/sql/query_log	16
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	28
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	16
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	24
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1061,129 +1203,144 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-localhost	wait/io/file/sql/query_log	17
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	29
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	17
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	17
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	25
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	1
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1205,125 +1362,141 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	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
-localhost	wait/io/file/sql/query_log	18
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	30
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	18
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	18
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	26
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	2
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1347,121 +1520,138 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	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
-localhost	wait/io/file/sql/query_log	19
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	31
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	19
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	19
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	27
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	3
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1488,116 +1678,134 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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
-localhost	wait/io/file/sql/query_log	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1625,116 +1833,134 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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
-localhost	wait/io/file/sql/query_log	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1762,115 +1988,133 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1898,115 +2142,133 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/file/sql/query_log	20
-localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+localhost	wait/io/file/sql/query_log	32
 localhost	wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2034,115 +2296,133 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2170,115 +2450,133 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2306,115 +2604,133 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2442,115 +2758,133 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2578,115 +2912,133 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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	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
+localhost	stage/sql/checking permissions	16
+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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2714,115 +3066,133 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2850,115 +3220,133 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2986,115 +3374,133 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3122,94 +3528,92 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -3218,19 +3622,39 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3258,94 +3682,92 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -3354,19 +3776,39 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	4
+localhost	statement/sp/freturn	4
 localhost	statement/sql/insert	4
-localhost	statement/sql/select	8
+localhost	statement/sql/select	12
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3394,94 +3836,92 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -3490,19 +3930,39 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3530,94 +3990,862 @@ 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_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
 execute dump_waits_host;
 host	event_name	count_star
 localhost	wait/io/file/sql/query_log	0
-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	0
-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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
+execute dump_statements_account;
+user	host	event_name	count_star
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+"================== TRANSACTIONS_BY_THREAD truncated =================="
+"================== Step 29 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+"================== TRANSACTIONS_BY_ACCOUNT truncated =================="
+"================== Step 30 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+"================== TRANSACTIONS_BY_USER truncated =================="
+"================== Step 31 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	4
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+"================== TRANSACTIONS_BY_HOST truncated =================="
+"================== Step 32 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+localhost	statement/com/Error	0
+localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
+localhost	statement/sql/insert	0
+localhost	statement/sql/select	0
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	5
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+"================== TRANSACTIONS_GLOBAL truncated =================="
+"================== Step 33 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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/rwlock/sql/LOCK_grant	0
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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/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/Opening tables	0
+stage/sql/starting	0
+execute dump_stages_history;
+event_name	count(event_name)
+stage/sql/checking permissions	16
+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
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -3626,19 +4854,39 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3653,7 +4901,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.accounts;
 "================== ACCOUNTS truncated =================="
-"================== Step 29 =================="
+"================== Step 34 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3670,16 +4918,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3687,25 +4933,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3714,19 +4960,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3737,7 +4999,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.users;
 "================== USERS truncated =================="
-"================== Step 30 =================="
+"================== Step 35 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3754,16 +5016,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3771,25 +5031,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3798,19 +5058,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3821,7 +5097,7 @@ HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 localhost	1	5
 truncate performance_schema.hosts;
 "================== HOSTS truncated =================="
-"================== Step 31 =================="
+"================== Step 36 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3838,16 +5114,14 @@ 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_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	0
-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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3855,25 +5129,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3882,19 +5156,35 @@ execute dump_statements_host;
 host	event_name	count_star
 localhost	statement/com/Error	0
 localhost	statement/com/Quit	0
+localhost	statement/sp/freturn	0
 localhost	statement/sql/insert	0
 localhost	statement/sql/select	0
 execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	0
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
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 6ca450ab864..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
@@ -17,7 +17,6 @@ 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_user_locks	0
 wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_history;
 event_name	count(event_name)
@@ -29,11 +28,11 @@ 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)
 execute dump_statements_account;
@@ -46,10 +45,22 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -63,7 +74,6 @@ connection default;
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/file/sql/query_log	1
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -74,7 +84,6 @@ user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
 user1	localhost	wait/io/file/sql/query_log	1
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	0
 execute dump_waits_user;
 user	event_name	count_star
@@ -83,35 +92,35 @@ host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
 wait/io/file/sql/query_log	1
-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	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
 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)
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -122,10 +131,23 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -135,19 +157,23 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con1;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 3 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user2	not found
@@ -157,8 +183,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
@@ -166,44 +191,44 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	4
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	4
+wait/io/file/sql/query_log	7
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	3
-stage/sql/Closing tables	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	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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -212,12 +237,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -231,12 +271,10 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user2	wait/io/file/sql/query_log	1
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -244,11 +282,9 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 user1	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user2	localhost	wait/io/file/sql/query_log	1
-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
@@ -256,51 +292,52 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	5
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	5
+wait/io/file/sql/query_log	8
 wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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
 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
 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
+stage/sql/checking permissions	4
+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	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	13
+stage/sql/init	3
+stage/sql/Opening tables	7
+stage/sql/starting	6
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -311,12 +348,28 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	1
 statement/sql/insert	1
-statement/sql/select	2
+statement/sql/select	3
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	1
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	1
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -327,23 +380,26 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con2;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user3	not found
@@ -351,11 +407,9 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
@@ -363,53 +417,54 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	8
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	8
+wait/io/file/sql/query_log	14
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	6
-stage/sql/Closing tables	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	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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -418,12 +473,28 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -438,29 +509,23 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user3	wait/io/file/sql/query_log	1
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user2	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user3	localhost	wait/io/file/sql/query_log	1
-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
@@ -468,60 +533,62 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	9
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	9
+wait/io/file/sql/query_log	15
 wait/synch/rwlock/sql/LOCK_grant	2
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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
 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
 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
+stage/sql/checking permissions	8
+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	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	24
+stage/sql/init	6
+stage/sql/Opening tables	13
+stage/sql/starting	12
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -532,12 +599,29 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	2
 statement/sql/insert	2
-statement/sql/select	4
+statement/sql/select	6
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -549,40 +633,39 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con3;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
@@ -590,62 +673,64 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	12
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	12
+wait/io/file/sql/query_log	21
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	9
-stage/sql/Closing tables	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	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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -654,12 +739,29 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -675,34 +777,26 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
 user4	wait/io/file/sql/query_log	1
-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
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user3	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 user4	localhost	wait/io/file/sql/query_log	1
-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
@@ -710,69 +804,72 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	13
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	13
+wait/io/file/sql/query_log	22
 wait/synch/rwlock/sql/LOCK_grant	3
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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
 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
 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
+stage/sql/checking permissions	12
+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	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	35
+stage/sql/init	9
+stage/sql/Opening tables	19
+stage/sql/starting	18
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -783,12 +880,30 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	3
 statement/sql/insert	3
-statement/sql/select	6
+statement/sql/select	9
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	3
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	3
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -801,45 +916,42 @@ USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 connection con4;
-select get_lock("marker", 10);
-get_lock("marker", 10)
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
-select release_lock("marker");
-release_lock("marker")
+select uuid_short() <> 1;
+uuid_short() <> 1
 1
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
+test.f(10,20)
+30
 connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/file/sql/query_log	4
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	wait/io/file/sql/query_log	7
 user1	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	4
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
@@ -847,71 +959,74 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	16
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	16
+wait/io/file/sql/query_log	28
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	24
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -920,12 +1035,30 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -944,30 +1077,23 @@ call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/file/sql/query_log	4
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
+user2	wait/io/file/sql/query_log	7
 user2	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
@@ -975,71 +1101,74 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	17
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	17
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	25
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -1048,13 +1177,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	1
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1075,26 +1222,20 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/file/sql/query_log	4
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
+user3	wait/io/file/sql/query_log	7
 user3	wait/synch/rwlock/sql/LOCK_grant	1
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
@@ -1102,71 +1243,74 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	18
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	18
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	26
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -1175,13 +1319,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	2
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1204,22 +1366,17 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/file/sql/query_log	4
-user4	wait/synch/mutex/sql/LOCK_user_locks	0
+user4	wait/io/file/sql/query_log	7
 user4	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	7
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
@@ -1227,71 +1384,74 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	19
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	19
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	27
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -1300,13 +1460,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	3
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1332,17 +1510,13 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
@@ -1350,71 +1524,74 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -1423,13 +1600,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1456,17 +1651,13 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/file/sql/query_log	5
-user1	localhost	wait/synch/mutex/sql/LOCK_user_locks	0
+user1	localhost	wait/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 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/io/file/sql/query_log	8
 user4	localhost	wait/synch/rwlock/sql/LOCK_grant	1
 execute dump_waits_user;
 user	event_name	count_star
@@ -1474,71 +1665,74 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -1547,13 +1741,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1580,16 +1792,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_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
@@ -1597,71 +1805,74 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -1670,13 +1881,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1703,16 +1932,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_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
@@ -1720,71 +1945,74 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -1793,13 +2021,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1826,16 +2072,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_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
@@ -1843,71 +2085,74 @@ execute dump_waits_host;
 host	event_name	count_star
 execute dump_waits_global;
 event_name	count_star
-wait/io/file/sql/query_log	20
-wait/synch/mutex/sql/LOCK_user_locks	0
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_waits_history;
 event_name	count(event_name)
-wait/io/file/sql/query_log	20
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -1916,13 +2161,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1949,16 +2212,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_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
@@ -1967,70 +2226,73 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -2039,13 +2301,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2072,16 +2352,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_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
@@ -2090,70 +2366,73 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
-user1	localhost	stage/sql/Checking permissions	3
-user1	localhost	stage/sql/Closing tables	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	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	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	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	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
 execute dump_stages_host;
 host	event_name	count_star
 execute dump_stages_global;
 event_name	count_star
-stage/sql/Checking permissions	12
-stage/sql/Closing tables	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	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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -2162,13 +2441,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2195,16 +2492,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_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
@@ -2213,70 +2506,73 @@ 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_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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -2285,13 +2581,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2318,16 +2632,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_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
@@ -2336,70 +2646,73 @@ 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_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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -2408,13 +2721,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2441,16 +2772,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_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
@@ -2459,70 +2786,73 @@ 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_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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
 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
+stage/sql/checking permissions	16
+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	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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -2531,13 +2861,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2564,16 +2912,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_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
@@ -2582,70 +2926,73 @@ 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_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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -2654,13 +3001,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2687,16 +3052,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_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
@@ -2705,70 +3066,73 @@ 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_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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	1
+user1	localhost	statement/sp/freturn	1
 user1	localhost	statement/sql/insert	1
-user1	localhost	statement/sql/select	2
+user1	localhost	statement/sql/select	3
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	1
+user2	localhost	statement/sp/freturn	1
 user2	localhost	statement/sql/insert	1
-user2	localhost	statement/sql/select	2
+user2	localhost	statement/sql/select	3
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	1
+user3	localhost	statement/sp/freturn	1
 user3	localhost	statement/sql/insert	1
-user3	localhost	statement/sql/select	2
+user3	localhost	statement/sql/select	3
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	1
+user4	localhost	statement/sp/freturn	1
 user4	localhost	statement/sql/insert	1
-user4	localhost	statement/sql/select	2
+user4	localhost	statement/sql/select	3
 execute dump_statements_user;
 user	event_name	count_star
 execute dump_statements_host;
@@ -2777,13 +3141,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2810,16 +3192,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_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
@@ -2828,68 +3206,71 @@ 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_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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -2900,13 +3281,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2933,16 +3332,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_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
@@ -2951,68 +3346,71 @@ 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_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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -3023,13 +3421,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3056,16 +3472,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_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
@@ -3074,68 +3486,71 @@ 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_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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -3146,13 +3561,31 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3179,16 +3612,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_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
@@ -3197,68 +3626,211 @@ 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_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/io/file/sql/query_log	32
 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
-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/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
 user2	localhost	stage/sql/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
+user2	localhost	stage/sql/starting	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/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
+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
 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
 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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
+execute dump_statements_account;
+user	host	event_name	count_star
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+"================== TRANSACTIONS_BY_THREAD truncated =================="
+"================== Step 29 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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
+execute dump_stages_global;
+event_name	count_star
+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)
+stage/sql/checking permissions	16
+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
 user1	localhost	statement/com/Error	0
 user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
 user1	localhost	statement/sql/insert	0
 user1	localhost	statement/sql/select	0
 user2	localhost	statement/com/Error	0
 user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
 user2	localhost	statement/sql/insert	0
 user2	localhost	statement/sql/select	0
 user3	localhost	statement/com/Error	0
 user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
 user3	localhost	statement/sql/insert	0
 user3	localhost	statement/sql/select	0
 user4	localhost	statement/com/Error	0
 user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
 user4	localhost	statement/sql/insert	0
 user4	localhost	statement/sql/select	0
 execute dump_statements_user;
@@ -3269,13 +3841,591 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	1
+user2	localhost	transaction	1
+user3	localhost	transaction	1
+user4	localhost	transaction	1
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+"================== TRANSACTIONS_BY_ACCOUNT truncated =================="
+"================== Step 30 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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
+execute dump_stages_global;
+event_name	count_star
+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)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+"================== TRANSACTIONS_BY_USER truncated =================="
+"================== Step 31 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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
+execute dump_stages_global;
+event_name	count_star
+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)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+"================== TRANSACTIONS_BY_HOST truncated =================="
+"================== Step 32 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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
+execute dump_stages_global;
+event_name	count_star
+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)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+"================== TRANSACTIONS_GLOBAL truncated =================="
+"================== Step 33 =================="
+call dump_thread();
+username	status
+user1	not found
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+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/rwlock/sql/LOCK_grant	0
+user2	localhost	wait/io/file/sql/query_log	0
+user2	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user3	localhost	wait/io/file/sql/query_log	0
+user3	localhost	wait/synch/rwlock/sql/LOCK_grant	0
+user4	localhost	wait/io/file/sql/query_log	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
+execute dump_waits_global;
+event_name	count_star
+wait/io/file/sql/query_log	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/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/Opening tables	0
+user1	localhost	stage/sql/starting	0
+user2	localhost	stage/sql/checking permissions	0
+user2	localhost	stage/sql/closing tables	0
+user2	localhost	stage/sql/init	0
+user2	localhost	stage/sql/Opening tables	0
+user2	localhost	stage/sql/starting	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/Opening tables	0
+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
+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
+execute dump_stages_global;
+event_name	count_star
+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)
+stage/sql/checking permissions	16
+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
+user1	localhost	statement/com/Error	0
+user1	localhost	statement/com/Quit	0
+user1	localhost	statement/sp/freturn	0
+user1	localhost	statement/sql/insert	0
+user1	localhost	statement/sql/select	0
+user2	localhost	statement/com/Error	0
+user2	localhost	statement/com/Quit	0
+user2	localhost	statement/sp/freturn	0
+user2	localhost	statement/sql/insert	0
+user2	localhost	statement/sql/select	0
+user3	localhost	statement/com/Error	0
+user3	localhost	statement/com/Quit	0
+user3	localhost	statement/sp/freturn	0
+user3	localhost	statement/sql/insert	0
+user3	localhost	statement/sql/select	0
+user4	localhost	statement/com/Error	0
+user4	localhost	statement/com/Quit	0
+user4	localhost	statement/sp/freturn	0
+user4	localhost	statement/sql/insert	0
+user4	localhost	statement/sql/select	0
+execute dump_statements_user;
+user	event_name	count_star
+execute dump_statements_host;
+host	event_name	count_star
+execute dump_statements_global;
+event_name	count_star
+statement/com/Error	0
+statement/com/Quit	0
+statement/sp/freturn	0
+statement/sql/insert	0
+statement/sql/select	0
+execute dump_statements_history;
+event_name	count(event_name)
+statement/com/Quit	4
+statement/sp/freturn	4
+statement/sql/insert	4
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+user1	localhost	transaction	0
+user2	localhost	transaction	0
+user3	localhost	transaction	0
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3289,7 +4439,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.accounts;
 "================== ACCOUNTS truncated =================="
-"================== Step 29 =================="
+"================== Step 34 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3308,11 +4458,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3322,18 +4471,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3344,13 +4493,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3360,7 +4523,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.users;
 "================== USERS truncated =================="
-"================== Step 30 =================="
+"================== Step 35 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3379,11 +4542,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3393,18 +4555,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3415,13 +4577,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3431,7 +4607,7 @@ execute dump_hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 truncate performance_schema.hosts;
 "================== HOSTS truncated =================="
-"================== Step 31 =================="
+"================== Step 36 =================="
 call dump_thread();
 username	status
 user1	not found
@@ -3450,11 +4626,10 @@ 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_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/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3464,18 +4639,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)
-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	46
+stage/sql/init	12
+stage/sql/Opening tables	25
+stage/sql/starting	28
 execute dump_statements_account;
 user	host	event_name	count_star
 execute dump_statements_user;
@@ -3486,13 +4661,27 @@ execute dump_statements_global;
 event_name	count_star
 statement/com/Error	0
 statement/com/Quit	0
+statement/sp/freturn	0
 statement/sql/insert	0
 statement/sql/select	0
 execute dump_statements_history;
 event_name	count(event_name)
 statement/com/Quit	4
+statement/sp/freturn	4
 statement/sql/insert	4
-statement/sql/select	8
+statement/sql/select	12
+execute dump_transactions_account;
+user	host	event_name	count_star
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	0
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
diff --git a/mysql-test/suite/perfschema/r/file_misc.result b/mysql-test/suite/perfschema/r/file_misc.result
new file mode 100644
index 00000000000..31094e64b59
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/file_misc.result
@@ -0,0 +1 @@
+select * from information_schema.columns ORDER BY table_name;
diff --git a/mysql-test/suite/perfschema/r/func_file_io.result b/mysql-test/suite/perfschema/r/func_file_io.result
index d710774a1f4..880e00367d0 100644
--- a/mysql-test/suite/perfschema/r/func_file_io.result
+++ b/mysql-test/suite/perfschema/r/func_file_io.result
@@ -130,7 +130,7 @@ GROUP BY p.processlist_user, h.operation
 HAVING BYTES > 0
 ORDER BY p.processlist_user, h.operation;
 UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -140,9 +140,15 @@ 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
@@ -152,6 +158,7 @@ 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
diff --git a/mysql-test/suite/perfschema/r/func_mutex.result b/mysql-test/suite/perfschema/r/func_mutex.result
index 1bd70b16811..b5c5e33f2c6 100644
--- a/mysql-test/suite/perfschema/r/func_mutex.result
+++ b/mysql-test/suite/perfschema/r/func_mutex.result
@@ -9,7 +9,7 @@ where NAME = 'wait/synch/mutex/mysys/THR_LOCK::mutex' GROUP BY NAME;
 NAME
 wait/synch/mutex/mysys/THR_LOCK::mutex
 select NAME from performance_schema.rwlock_instances
-where NAME = 'wait/synch/rwlock/sql/LOCK_grant';
+where NAME = 'wait/synch/rwlock/sql/LOCK_grant' limit 1;
 NAME
 wait/synch/rwlock/sql/LOCK_grant
 DROP TABLE IF EXISTS t1;
@@ -105,7 +105,7 @@ Success
 UPDATE performance_schema.setup_instruments SET enabled = 'YES';
 DROP TABLE t1;
 UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -115,9 +115,15 @@ 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
@@ -127,6 +133,7 @@ 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
diff --git a/mysql-test/suite/perfschema/r/global_objects.result b/mysql-test/suite/perfschema/r/global_objects.result
new file mode 100644
index 00000000000..dd53a11ddac
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/global_objects.result
@@ -0,0 +1,33 @@
+select count(*) from performance_schema.setup_instruments
+where enabled='YES'
+  and name like "wait/%";
+count(*)
+0
+select count(*) > 0 from performance_schema.mutex_instances;
+count(*) > 0
+1
+select count(*) > 0 from performance_schema.rwlock_instances;
+count(*) > 0
+1
+select count(*) > 0 from performance_schema.cond_instances;
+count(*) > 0
+1
+select count(*) > 0 from performance_schema.socket_instances;
+count(*) > 0
+1
+select NAME from performance_schema.mutex_instances
+where NAME = "wait/synch/mutex/sql/LOCK_gdl";
+NAME
+wait/synch/mutex/sql/LOCK_gdl
+select NAME from performance_schema.rwlock_instances
+where NAME = "wait/synch/rwlock/sql/LOCK_system_variables_hash";
+NAME
+wait/synch/rwlock/sql/LOCK_system_variables_hash
+select NAME from performance_schema.cond_instances
+where NAME = "wait/synch/cond/sql/COND_server_started";
+NAME
+wait/synch/cond/sql/COND_server_started
+select EVENT_NAME from performance_schema.socket_instances
+where EVENT_NAME = "wait/io/socket/sql/client_connection";
+EVENT_NAME
+wait/io/socket/sql/client_connection
diff --git a/mysql-test/suite/perfschema/r/global_read_lock.result b/mysql-test/suite/perfschema/r/global_read_lock.result
index 6eed64f12d5..df98b9bd1bb 100644
--- a/mysql-test/suite/perfschema/r/global_read_lock.result
+++ b/mysql-test/suite/perfschema/r/global_read_lock.result
@@ -27,7 +27,7 @@ operation
 from performance_schema.events_waits_current
 where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status";
 event_name	short_source	timer_end	timer_wait	operation
-wait/synch/cond/sql/MDL_context::COND_wait_status	mdl.cc:	SET	SET	timed_wait
+wait/synch/cond/sql/MDL_context::COND_wait_status		SET	SET	timed_wait
 unlock tables;
 connection con1;
 update performance_schema.setup_instruments set enabled='NO';
diff --git a/mysql-test/suite/perfschema/r/indexed_table_io.result b/mysql-test/suite/perfschema/r/indexed_table_io.result
index 57518673491..75bc57dcbcf 100644
--- a/mysql-test/suite/perfschema/r/indexed_table_io.result
+++ b/mysql-test/suite/perfschema/r/indexed_table_io.result
@@ -30,19 +30,19 @@ truncate table performance_schema.events_waits_history_long;
 update performance_schema.setup_consumers set enabled='YES';
 # Printing of 100 inserts per table is suppressed
 update performance_schema.setup_consumers set enabled='NO';
-select COUNT(*)
+select SUM(NUMBER_OF_BYTES)
 from performance_schema.events_waits_history_long
 where event_name like 'wait/io/table/%'
 and object_schema = 'test'
 and object_name =  'no_index_tab';
-COUNT(*)
+SUM(NUMBER_OF_BYTES)
 100
-select COUNT(*)
+select SUM(NUMBER_OF_BYTES)
 from performance_schema.events_waits_history_long
 where event_name like 'wait/io/table/%'
 and object_schema = 'test'
 and object_name =  'index_tab';
-COUNT(*)
+SUM(NUMBER_OF_BYTES)
 100
 select count(*) from test.no_index_tab;
 count(*)
@@ -56,75 +56,75 @@ select avg(a) from test.no_index_tab;
 avg(a)
 50.5000
 update performance_schema.setup_consumers set enabled='NO';
-select COUNT(*)
+select SUM(NUMBER_OF_BYTES)
 from performance_schema.events_waits_history_long
 where event_name like 'wait/io/table/%'
 and object_schema = 'test'
 and object_name =  'no_index_tab';
-COUNT(*)
-101
+SUM(NUMBER_OF_BYTES)
+100
 truncate table performance_schema.events_waits_history_long;
 update performance_schema.setup_consumers set enabled='YES';
 select avg(a) from test.index_tab;
 avg(a)
 50.5000
 update performance_schema.setup_consumers set enabled='NO';
-select COUNT(*)
+select SUM(NUMBER_OF_BYTES)
 from performance_schema.events_waits_history_long
 where event_name like 'wait/io/table/%'
 and object_schema = 'test'
 and object_name =  'index_tab';
-COUNT(*)
-101
+SUM(NUMBER_OF_BYTES)
+100
 truncate table performance_schema.events_waits_history_long;
 update performance_schema.setup_consumers set enabled='YES';
 select 1 as my_column from test.no_index_tab where a = 50;
 my_column
 1
 update performance_schema.setup_consumers set enabled='NO';
-select COUNT(*)
+select SUM(NUMBER_OF_BYTES)
 from performance_schema.events_waits_history_long
 where event_name like 'wait/io/table/%'
 and object_schema = 'test'
 and object_name =  'no_index_tab';
-COUNT(*)
-101
+SUM(NUMBER_OF_BYTES)
+100
 truncate table performance_schema.events_waits_history_long;
 update performance_schema.setup_consumers set enabled='YES';
 select 1 as my_column from test.index_tab where a = 50;
 my_column
 1
 update performance_schema.setup_consumers set enabled='NO';
-select COUNT(*)
+select SUM(NUMBER_OF_BYTES)
 from performance_schema.events_waits_history_long
 where event_name like 'wait/io/table/%'
 and object_schema = 'test'
 and object_name =  'index_tab';
-COUNT(*)
+SUM(NUMBER_OF_BYTES)
 1
 truncate table performance_schema.events_waits_history_long;
 update performance_schema.setup_consumers set enabled='YES';
 delete from test.no_index_tab where a = 51;
 update performance_schema.setup_consumers set enabled='NO';
-select COUNT(*)
+select SUM(NUMBER_OF_BYTES)
 from performance_schema.events_waits_history_long
 where event_name like 'wait/io/table/%'
 and object_schema = 'test'
 and object_name =  'no_index_tab';
-COUNT(*)
+SUM(NUMBER_OF_BYTES)
 102
 truncate table performance_schema.events_waits_history_long;
 update performance_schema.setup_consumers set enabled='YES';
 delete from test.index_tab where a = 51;
 update performance_schema.setup_consumers set enabled='NO';
-select COUNT(*)
+select SUM(NUMBER_OF_BYTES)
 from performance_schema.events_waits_history_long
 where event_name like 'wait/io/table/%'
 and object_schema = 'test'
 and object_name =  'index_tab';
-COUNT(*)
+SUM(NUMBER_OF_BYTES)
 2
-show status like 'performance_schema_%';
+show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -134,9 +134,15 @@ 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
@@ -146,6 +152,7 @@ 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
diff --git a/mysql-test/suite/perfschema/r/information_schema.result b/mysql-test/suite/perfschema/r/information_schema.result
index a684fd7b84e..3f4a8cf6336 100644
--- a/mysql-test/suite/perfschema/r/information_schema.result
+++ b/mysql-test/suite/perfschema/r/information_schema.result
@@ -19,9 +19,18 @@ performance_schema	events_statements_history_long	def
 performance_schema	events_statements_summary_by_account_by_event_name	def
 performance_schema	events_statements_summary_by_digest	def
 performance_schema	events_statements_summary_by_host_by_event_name	def
+performance_schema	events_statements_summary_by_program	def
 performance_schema	events_statements_summary_by_thread_by_event_name	def
 performance_schema	events_statements_summary_by_user_by_event_name	def
 performance_schema	events_statements_summary_global_by_event_name	def
+performance_schema	events_transactions_current	def
+performance_schema	events_transactions_history	def
+performance_schema	events_transactions_history_long	def
+performance_schema	events_transactions_summary_by_account_by_event_name	def
+performance_schema	events_transactions_summary_by_host_by_event_name	def
+performance_schema	events_transactions_summary_by_thread_by_event_name	def
+performance_schema	events_transactions_summary_by_user_by_event_name	def
+performance_schema	events_transactions_summary_global_by_event_name	def
 performance_schema	events_waits_current	def
 performance_schema	events_waits_history	def
 performance_schema	events_waits_history_long	def
@@ -34,14 +43,27 @@ 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
+performance_schema	global_status	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
 performance_schema	mutex_instances	def
 performance_schema	objects_summary_global_by_type	def
 performance_schema	performance_timers	def
+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_connection_configuration	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	setup_actors	def
 performance_schema	setup_consumers	def
 performance_schema	setup_instruments	def
@@ -50,11 +72,17 @@ performance_schema	setup_timers	def
 performance_schema	socket_instances	def
 performance_schema	socket_summary_by_event_name	def
 performance_schema	socket_summary_by_instance	def
+performance_schema	status_by_account	def
+performance_schema	status_by_host	def
+performance_schema	status_by_thread	def
+performance_schema	status_by_user	def
+performance_schema	table_handles	def
 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	users	def
+performance_schema	user_variables_by_thread	def
 select lower(TABLE_NAME), TABLE_TYPE, ENGINE
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -76,9 +104,18 @@ events_statements_history_long	BASE TABLE	PERFORMANCE_SCHEMA
 events_statements_summary_by_account_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 events_statements_summary_by_digest	BASE TABLE	PERFORMANCE_SCHEMA
 events_statements_summary_by_host_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
+events_statements_summary_by_program	BASE TABLE	PERFORMANCE_SCHEMA
 events_statements_summary_by_thread_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 events_statements_summary_by_user_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 events_statements_summary_global_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
+events_transactions_current	BASE TABLE	PERFORMANCE_SCHEMA
+events_transactions_history	BASE TABLE	PERFORMANCE_SCHEMA
+events_transactions_history_long	BASE TABLE	PERFORMANCE_SCHEMA
+events_transactions_summary_by_account_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
+events_transactions_summary_by_host_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
+events_transactions_summary_by_thread_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
+events_transactions_summary_by_user_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
+events_transactions_summary_global_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 events_waits_current	BASE TABLE	PERFORMANCE_SCHEMA
 events_waits_history	BASE TABLE	PERFORMANCE_SCHEMA
 events_waits_history_long	BASE TABLE	PERFORMANCE_SCHEMA
@@ -91,14 +128,27 @@ 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
+global_status	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
 mutex_instances	BASE TABLE	PERFORMANCE_SCHEMA
 objects_summary_global_by_type	BASE TABLE	PERFORMANCE_SCHEMA
 performance_timers	BASE TABLE	PERFORMANCE_SCHEMA
+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_connection_configuration	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
 setup_actors	BASE TABLE	PERFORMANCE_SCHEMA
 setup_consumers	BASE TABLE	PERFORMANCE_SCHEMA
 setup_instruments	BASE TABLE	PERFORMANCE_SCHEMA
@@ -107,11 +157,17 @@ setup_timers	BASE TABLE	PERFORMANCE_SCHEMA
 socket_instances	BASE TABLE	PERFORMANCE_SCHEMA
 socket_summary_by_event_name	BASE TABLE	PERFORMANCE_SCHEMA
 socket_summary_by_instance	BASE TABLE	PERFORMANCE_SCHEMA
+status_by_account	BASE TABLE	PERFORMANCE_SCHEMA
+status_by_host	BASE TABLE	PERFORMANCE_SCHEMA
+status_by_thread	BASE TABLE	PERFORMANCE_SCHEMA
+status_by_user	BASE TABLE	PERFORMANCE_SCHEMA
+table_handles	BASE TABLE	PERFORMANCE_SCHEMA
 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
 users	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'
@@ -133,9 +189,18 @@ events_statements_history_long	10	Dynamic
 events_statements_summary_by_account_by_event_name	10	Dynamic
 events_statements_summary_by_digest	10	Dynamic
 events_statements_summary_by_host_by_event_name	10	Dynamic
+events_statements_summary_by_program	10	Dynamic
 events_statements_summary_by_thread_by_event_name	10	Dynamic
 events_statements_summary_by_user_by_event_name	10	Dynamic
 events_statements_summary_global_by_event_name	10	Dynamic
+events_transactions_current	10	Dynamic
+events_transactions_history	10	Dynamic
+events_transactions_history_long	10	Dynamic
+events_transactions_summary_by_account_by_event_name	10	Dynamic
+events_transactions_summary_by_host_by_event_name	10	Dynamic
+events_transactions_summary_by_thread_by_event_name	10	Dynamic
+events_transactions_summary_by_user_by_event_name	10	Dynamic
+events_transactions_summary_global_by_event_name	10	Dynamic
 events_waits_current	10	Dynamic
 events_waits_history	10	Dynamic
 events_waits_history_long	10	Dynamic
@@ -148,14 +213,27 @@ 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
+global_status	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
 mutex_instances	10	Dynamic
 objects_summary_global_by_type	10	Dynamic
 performance_timers	10	Fixed
+prepared_statements_instances	10	Dynamic
+replication_applier_configuration	10	Fixed
+replication_applier_status	10	Fixed
+replication_applier_status_by_coordinator	10	Dynamic
+replication_connection_configuration	10	Dynamic
 rwlock_instances	10	Dynamic
 session_account_connect_attrs	10	Dynamic
 session_connect_attrs	10	Dynamic
+session_status	10	Dynamic
 setup_actors	10	Fixed
 setup_consumers	10	Dynamic
 setup_instruments	10	Dynamic
@@ -164,68 +242,109 @@ setup_timers	10	Dynamic
 socket_instances	10	Dynamic
 socket_summary_by_event_name	10	Dynamic
 socket_summary_by_instance	10	Dynamic
+status_by_account	10	Dynamic
+status_by_host	10	Dynamic
+status_by_thread	10	Dynamic
+status_by_user	10	Dynamic
+table_handles	10	Dynamic
 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
 users	10	Fixed
+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'
+  order by table_name;
+lower(TABLE_NAME)	AVG_ROW_LENGTH
+accounts	0
+cond_instances	0
+events_stages_current	0
+events_stages_history	0
+events_stages_history_long	0
+events_stages_summary_by_account_by_event_name	0
+events_stages_summary_by_host_by_event_name	0
+events_stages_summary_by_thread_by_event_name	0
+events_stages_summary_by_user_by_event_name	0
+events_stages_summary_global_by_event_name	0
+events_statements_current	0
+events_statements_history	0
+events_statements_history_long	0
+events_statements_summary_by_account_by_event_name	0
+events_statements_summary_by_digest	0
+events_statements_summary_by_host_by_event_name	0
+events_statements_summary_by_program	0
+events_statements_summary_by_thread_by_event_name	0
+events_statements_summary_by_user_by_event_name	0
+events_statements_summary_global_by_event_name	0
+events_transactions_current	0
+events_transactions_history	0
+events_transactions_history_long	0
+events_transactions_summary_by_account_by_event_name	0
+events_transactions_summary_by_host_by_event_name	0
+events_transactions_summary_by_thread_by_event_name	0
+events_transactions_summary_by_user_by_event_name	0
+events_transactions_summary_global_by_event_name	0
+events_waits_current	0
+events_waits_history	0
+events_waits_history_long	0
+events_waits_summary_by_account_by_event_name	0
+events_waits_summary_by_host_by_event_name	0
+events_waits_summary_by_instance	0
+events_waits_summary_by_thread_by_event_name	0
+events_waits_summary_by_user_by_event_name	0
+events_waits_summary_global_by_event_name	0
+file_instances	0
+file_summary_by_event_name	0
+file_summary_by_instance	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
+memory_summary_by_user_by_event_name	0
+memory_summary_global_by_event_name	0
+metadata_locks	0
+mutex_instances	0
+objects_summary_global_by_type	0
+performance_timers	0
+prepared_statements_instances	0
+replication_applier_configuration	0
+replication_applier_status	0
+replication_applier_status_by_coordinator	0
+replication_connection_configuration	0
+rwlock_instances	0
+session_account_connect_attrs	0
+session_connect_attrs	0
+setup_actors	0
+setup_consumers	0
+setup_instruments	0
+setup_objects	0
+setup_timers	0
+socket_instances	0
+socket_summary_by_event_name	0
+socket_summary_by_instance	0
+table_handles	0
+table_io_waits_summary_by_index_usage	0
+table_io_waits_summary_by_table	0
+table_lock_waits_summary_by_table	0
+threads	0
+users	0
+user_variables_by_thread	0
 select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH
 from information_schema.tables
-where TABLE_SCHEMA='performance_schema'
+where TABLE_SCHEMA='performance_schema' and
+lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status'
   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
+global_status	table_rows	avg_row_len
+session_status	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
 select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -247,9 +366,18 @@ events_statements_history_long	0	0
 events_statements_summary_by_account_by_event_name	0	0
 events_statements_summary_by_digest	0	0
 events_statements_summary_by_host_by_event_name	0	0
+events_statements_summary_by_program	0	0
 events_statements_summary_by_thread_by_event_name	0	0
 events_statements_summary_by_user_by_event_name	0	0
 events_statements_summary_global_by_event_name	0	0
+events_transactions_current	0	0
+events_transactions_history	0	0
+events_transactions_history_long	0	0
+events_transactions_summary_by_account_by_event_name	0	0
+events_transactions_summary_by_host_by_event_name	0	0
+events_transactions_summary_by_thread_by_event_name	0	0
+events_transactions_summary_by_user_by_event_name	0	0
+events_transactions_summary_global_by_event_name	0	0
 events_waits_current	0	0
 events_waits_history	0	0
 events_waits_history_long	0	0
@@ -262,14 +390,27 @@ 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
+global_status	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
 mutex_instances	0	0
 objects_summary_global_by_type	0	0
 performance_timers	0	0
+prepared_statements_instances	0	0
+replication_applier_configuration	0	0
+replication_applier_status	0	0
+replication_applier_status_by_coordinator	0	0
+replication_connection_configuration	0	0
 rwlock_instances	0	0
 session_account_connect_attrs	0	0
 session_connect_attrs	0	0
+session_status	0	0
 setup_actors	0	0
 setup_consumers	0	0
 setup_instruments	0	0
@@ -278,11 +419,17 @@ setup_timers	0	0
 socket_instances	0	0
 socket_summary_by_event_name	0	0
 socket_summary_by_instance	0	0
+status_by_account	0	0
+status_by_host	0	0
+status_by_thread	0	0
+status_by_user	0	0
+table_handles	0	0
 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
 users	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'
@@ -304,9 +451,18 @@ events_statements_history_long	0	0	NULL
 events_statements_summary_by_account_by_event_name	0	0	NULL
 events_statements_summary_by_digest	0	0	NULL
 events_statements_summary_by_host_by_event_name	0	0	NULL
+events_statements_summary_by_program	0	0	NULL
 events_statements_summary_by_thread_by_event_name	0	0	NULL
 events_statements_summary_by_user_by_event_name	0	0	NULL
 events_statements_summary_global_by_event_name	0	0	NULL
+events_transactions_current	0	0	NULL
+events_transactions_history	0	0	NULL
+events_transactions_history_long	0	0	NULL
+events_transactions_summary_by_account_by_event_name	0	0	NULL
+events_transactions_summary_by_host_by_event_name	0	0	NULL
+events_transactions_summary_by_thread_by_event_name	0	0	NULL
+events_transactions_summary_by_user_by_event_name	0	0	NULL
+events_transactions_summary_global_by_event_name	0	0	NULL
 events_waits_current	0	0	NULL
 events_waits_history	0	0	NULL
 events_waits_history_long	0	0	NULL
@@ -319,14 +475,27 @@ 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
+global_status	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
 mutex_instances	0	0	NULL
 objects_summary_global_by_type	0	0	NULL
 performance_timers	0	0	NULL
+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_connection_configuration	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
 setup_actors	0	0	NULL
 setup_consumers	0	0	NULL
 setup_instruments	0	0	NULL
@@ -335,11 +504,17 @@ setup_timers	0	0	NULL
 socket_instances	0	0	NULL
 socket_summary_by_event_name	0	0	NULL
 socket_summary_by_instance	0	0	NULL
+status_by_account	0	0	NULL
+status_by_host	0	0	NULL
+status_by_thread	0	0	NULL
+status_by_user	0	0	NULL
+table_handles	0	0	NULL
 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
 users	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'
@@ -361,9 +536,18 @@ events_statements_history_long	NULL	NULL	NULL
 events_statements_summary_by_account_by_event_name	NULL	NULL	NULL
 events_statements_summary_by_digest	NULL	NULL	NULL
 events_statements_summary_by_host_by_event_name	NULL	NULL	NULL
+events_statements_summary_by_program	NULL	NULL	NULL
 events_statements_summary_by_thread_by_event_name	NULL	NULL	NULL
 events_statements_summary_by_user_by_event_name	NULL	NULL	NULL
 events_statements_summary_global_by_event_name	NULL	NULL	NULL
+events_transactions_current	NULL	NULL	NULL
+events_transactions_history	NULL	NULL	NULL
+events_transactions_history_long	NULL	NULL	NULL
+events_transactions_summary_by_account_by_event_name	NULL	NULL	NULL
+events_transactions_summary_by_host_by_event_name	NULL	NULL	NULL
+events_transactions_summary_by_thread_by_event_name	NULL	NULL	NULL
+events_transactions_summary_by_user_by_event_name	NULL	NULL	NULL
+events_transactions_summary_global_by_event_name	NULL	NULL	NULL
 events_waits_current	NULL	NULL	NULL
 events_waits_history	NULL	NULL	NULL
 events_waits_history_long	NULL	NULL	NULL
@@ -376,14 +560,27 @@ 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
+global_status	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
 mutex_instances	NULL	NULL	NULL
 objects_summary_global_by_type	NULL	NULL	NULL
 performance_timers	NULL	NULL	NULL
+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_connection_configuration	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
 setup_actors	NULL	NULL	NULL
 setup_consumers	NULL	NULL	NULL
 setup_instruments	NULL	NULL	NULL
@@ -392,11 +589,17 @@ setup_timers	NULL	NULL	NULL
 socket_instances	NULL	NULL	NULL
 socket_summary_by_event_name	NULL	NULL	NULL
 socket_summary_by_instance	NULL	NULL	NULL
+status_by_account	NULL	NULL	NULL
+status_by_host	NULL	NULL	NULL
+status_by_thread	NULL	NULL	NULL
+status_by_user	NULL	NULL	NULL
+table_handles	NULL	NULL	NULL
 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
 users	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'
@@ -418,9 +621,18 @@ events_statements_history_long	utf8_general_ci	NULL
 events_statements_summary_by_account_by_event_name	utf8_general_ci	NULL
 events_statements_summary_by_digest	utf8_general_ci	NULL
 events_statements_summary_by_host_by_event_name	utf8_general_ci	NULL
+events_statements_summary_by_program	utf8_general_ci	NULL
 events_statements_summary_by_thread_by_event_name	utf8_general_ci	NULL
 events_statements_summary_by_user_by_event_name	utf8_general_ci	NULL
 events_statements_summary_global_by_event_name	utf8_general_ci	NULL
+events_transactions_current	utf8_general_ci	NULL
+events_transactions_history	utf8_general_ci	NULL
+events_transactions_history_long	utf8_general_ci	NULL
+events_transactions_summary_by_account_by_event_name	utf8_general_ci	NULL
+events_transactions_summary_by_host_by_event_name	utf8_general_ci	NULL
+events_transactions_summary_by_thread_by_event_name	utf8_general_ci	NULL
+events_transactions_summary_by_user_by_event_name	utf8_general_ci	NULL
+events_transactions_summary_global_by_event_name	utf8_general_ci	NULL
 events_waits_current	utf8_general_ci	NULL
 events_waits_history	utf8_general_ci	NULL
 events_waits_history_long	utf8_general_ci	NULL
@@ -433,14 +645,27 @@ 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
+global_status	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
 mutex_instances	utf8_general_ci	NULL
 objects_summary_global_by_type	utf8_general_ci	NULL
 performance_timers	utf8_general_ci	NULL
+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_connection_configuration	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
 setup_actors	utf8_general_ci	NULL
 setup_consumers	utf8_general_ci	NULL
 setup_instruments	utf8_general_ci	NULL
@@ -449,11 +674,102 @@ setup_timers	utf8_general_ci	NULL
 socket_instances	utf8_general_ci	NULL
 socket_summary_by_event_name	utf8_general_ci	NULL
 socket_summary_by_instance	utf8_general_ci	NULL
+status_by_account	utf8_general_ci	NULL
+status_by_host	utf8_general_ci	NULL
+status_by_thread	utf8_general_ci	NULL
+status_by_user	utf8_general_ci	NULL
+table_handles	utf8_general_ci	NULL
 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
 users	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'
+  order by table_name;
+lower(TABLE_NAME)	CREATE_OPTIONS
+accounts	
+cond_instances	
+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_program	
+events_statements_summary_by_thread_by_event_name	
+events_statements_summary_by_user_by_event_name	
+events_statements_summary_global_by_event_name	
+events_transactions_current	
+events_transactions_history	
+events_transactions_history_long	
+events_transactions_summary_by_account_by_event_name	
+events_transactions_summary_by_host_by_event_name	
+events_transactions_summary_by_thread_by_event_name	
+events_transactions_summary_by_user_by_event_name	
+events_transactions_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	
+global_status	
+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	
+mutex_instances	
+objects_summary_global_by_type	
+performance_timers	
+prepared_statements_instances	
+replication_applier_configuration	
+replication_applier_status	
+replication_applier_status_by_coordinator	
+replication_connection_configuration	
+rwlock_instances	
+session_account_connect_attrs	
+session_connect_attrs	
+session_status	
+setup_actors	
+setup_consumers	
+setup_instruments	
+setup_objects	
+setup_timers	
+socket_instances	
+socket_summary_by_event_name	
+socket_summary_by_instance	
+status_by_account	
+status_by_host	
+status_by_thread	
+status_by_user	
+table_handles	
+table_io_waits_summary_by_index_usage	
+table_io_waits_summary_by_table	
+table_lock_waits_summary_by_table	
+threads	
+users	
+user_variables_by_thread	
 select lower(TABLE_NAME), TABLE_COMMENT
 from information_schema.tables
 where TABLE_SCHEMA='performance_schema'
@@ -475,9 +791,18 @@ 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_program	
 events_statements_summary_by_thread_by_event_name	
 events_statements_summary_by_user_by_event_name	
 events_statements_summary_global_by_event_name	
+events_transactions_current	
+events_transactions_history	
+events_transactions_history_long	
+events_transactions_summary_by_account_by_event_name	
+events_transactions_summary_by_host_by_event_name	
+events_transactions_summary_by_thread_by_event_name	
+events_transactions_summary_by_user_by_event_name	
+events_transactions_summary_global_by_event_name	
 events_waits_current	
 events_waits_history	
 events_waits_history_long	
@@ -490,14 +815,27 @@ events_waits_summary_global_by_event_name
 file_instances	
 file_summary_by_event_name	
 file_summary_by_instance	
+global_status	
 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	
 mutex_instances	
 objects_summary_global_by_type	
 performance_timers	
+prepared_statements_instances	
+replication_applier_configuration	
+replication_applier_status	
+replication_applier_status_by_coordinator	
+replication_connection_configuration	
 rwlock_instances	
 session_account_connect_attrs	
 session_connect_attrs	
+session_status	
 setup_actors	
 setup_consumers	
 setup_instruments	
@@ -506,8 +844,14 @@ setup_timers
 socket_instances	
 socket_summary_by_event_name	
 socket_summary_by_instance	
+status_by_account	
+status_by_host	
+status_by_thread	
+status_by_user	
+table_handles	
 table_io_waits_summary_by_index_usage	
 table_io_waits_summary_by_table	
 table_lock_waits_summary_by_table	
 threads	
 users	
+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 c37c1035e5a..286f0516e62 100644
--- a/mysql-test/suite/perfschema/r/innodb_table_io.result
+++ b/mysql-test/suite/perfschema/r/innodb_table_io.result
@@ -71,63 +71,69 @@ 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
-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		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_%';
 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
 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
new file mode 100644
index 00000000000..4b742610a39
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/io_cache.result
@@ -0,0 +1,96 @@
+
+## Connection default
+
+connection default;
+USE test;
+DROP TABLE IF EXISTS t1;
+SELECT @@global.binlog_cache_size;
+@@global.binlog_cache_size
+4096
+SELECT @@global.binlog_stmt_cache_size;
+@@global.binlog_stmt_cache_size
+4096
+SELECT * FROM performance_schema.setup_instruments WHERE name LIKE "%file/sql/io_cache%";
+NAME	ENABLED	TIMED
+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;
+START TRANSACTION;
+INSERT INTO t1 VALUES (1,'
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+');
+INSERT INTO t1 VALUES (2,'
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+');
+INSERT INTO t1 VALUES (3,'
+cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
+');
+INSERT INTO t1 VALUES (4,'
+dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
+');
+INSERT INTO t1 VALUES (5,'
+eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+');
+INSERT INTO t1 VALUES (6,'
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+');
+INSERT INTO t1 VALUES (7,'
+gggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
+');
+INSERT INTO t1 VALUES (8,'
+hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+');
+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
new file mode 100644
index 00000000000..b75b24ffdb4
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/max_program_zero.result
@@ -0,0 +1,313 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	0
+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	1
+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%";
+show global variables like "performance_schema_max_program_instances";
+Variable_name	Value
+performance_schema_max_program_instances	0
+show global variables like "performance_schema_max_statement_stack";
+Variable_name	Value
+performance_schema_max_statement_stack	1
+##################### 
+# Setup
+##################### 
+# SET-UP
+CREATE DATABASE nested_sp;
+USE nested_sp;
+CREATE TABLE t1(
+id   CHAR(16) NOT NULL DEFAULT '',
+data INT NOT NULL
+);
+CREATE TABLE t2(
+n INT UNSIGNED NOT NULL, 
+f BIGINT UNSIGNED
+) engine=innodb;
+############################
+# Creating Stored Programs #
+############################
+CREATE PROCEDURE c1(x INT)
+CALL c2("c", x)|
+CREATE PROCEDURE c2(s CHAR(16), x INT)
+CALL c3(x, s)|
+CREATE PROCEDURE c3(x INT, s CHAR(16))
+CALL c4("level", x, s)|
+CREATE PROCEDURE c4(l CHAR(8), x INT, s CHAR(16))
+INSERT INTO t1 VALUES (concat(l,s), x)|
+CREATE PROCEDURE iotest(x1 CHAR(16), x2 CHAR(16), y INT)
+BEGIN
+CALL inc2(x2, y);
+INSERT INTO t1 VALUES (x1, y);
+END|
+CREATE PROCEDURE inc2(x CHAR(16), y INT)
+BEGIN
+CALL inc(y);
+INSERT INTO t1 VALUES (x, y);
+END|
+CREATE PROCEDURE inc(inout io INT)
+SET io = io + 1|
+CREATE FUNCTION mul(x INT, y INT) RETURNS INT
+RETURN x*y|
+CREATE FUNCTION inc(i INT) RETURNS INT
+RETURN i+1|
+CREATE FUNCTION fac(n INT UNSIGNED) RETURNS BIGINT UNSIGNED
+BEGIN
+DECLARE f BIGINT UNSIGNED DEFAULT 1;
+WHILE n > 1 DO
+SET f = f * n;
+SET n = n - 1;
+END WHILE;
+RETURN f;
+END|
+CREATE FUNCTION fun(i INT, u INT UNSIGNED) RETURNS DOUBLE
+RETURN mul(inc(i), fac(u))|
+CREATE PROCEDURE ifac(n INT UNSIGNED)
+BEGIN
+DECLARE i BIGINT UNSIGNED DEFAULT 1;
+IF n > 20 THEN
+SET n = 20;         # bigint overflow otherwise
+END IF;
+WHILE i <= n DO
+BEGIN
+INSERT INTO t2 VALUES (i, fac(i));
+SET i = i + 1;
+END;
+END WHILE;
+END|
+CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
+CALL ifac(10)|
+TRUNCATE performance_schema.events_statements_summary_by_program;
+#####################
+# Executing Queries
+##################### 
+#####################
+# Executing queries #
+#####################
+CALL c1(42);
+SELECT * FROM t1;
+id	data
+levelc	42
+DELETE FROM t1;
+CALL iotest("io1", "io2", 1);
+SELECT * FROM t1 ORDER BY data DESC;
+id	data
+io2	2
+io1	1
+DELETE FROM t1;
+SELECT fun(6,10);
+fun(6,10)
+25401600
+INSERT INTO t1 VALUES (20,13);
+SELECT * FROM t2;
+n	f
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+###########################################
+# Quering PS statement summary table      #
+########################################### 
+SELECT OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
+FROM performance_schema.events_statements_summary_by_program;
+OBJECT_TYPE	OBJECT_NAME	OBJECT_SCHEMA
+SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_program;
+COUNT(*)
+0
+##################### 
+# Cleanup
+##################### 
+DROP PROCEDURE c4;
+DROP PROCEDURE c3;
+DROP PROCEDURE c2;
+DROP PROCEDURE c1;
+DROP PROCEDURE inc;
+DROP PROCEDURE inc2;
+DROP PROCEDURE iotest;
+DROP FUNCTION mul;
+DROP FUNCTION inc;
+DROP FUNCTION fac;
+DROP FUNCTION fun;
+DROP PROCEDURE ifac;
+DROP TRIGGER trg;
+DROP TABLE t1,t2;
+DROP DATABASE nested_sp;
diff --git a/mysql-test/suite/perfschema/r/mdl_func.result b/mysql-test/suite/perfschema/r/mdl_func.result
new file mode 100644
index 00000000000..4887b15efa5
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/mdl_func.result
@@ -0,0 +1,920 @@
+UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
+UPDATE performance_schema.setup_instruments SET enabled = 'YES'
+WHERE name in ('wait/io/table/sql/handler',
+'wait/lock/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',''));
+grant ALL on *.* to user1@localhost;
+grant ALL on *.* to user2@localhost;
+set sql_mode= @orig_sql_mode;
+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)
+begin
+if (THREAD_ID IS NULL)
+then
+return NULL;
+end if;
+if (THREAD_ID = @user1_tid)
+then
+return "USER1";
+end if;
+if (THREAD_ID = @user2_tid)
+then
+return "USER2";
+end if;
+return "OTHER";
+end;
+//
+select thread_id_name(NULL);
+thread_id_name(NULL)
+NULL
+select thread_id_name(@user1_tid);
+thread_id_name(@user1_tid)
+USER1
+select thread_id_name(@user2_tid);
+thread_id_name(@user2_tid)
+USER2
+prepare dump_metadata_locks from
+"select OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME,
+    LOCK_TYPE, LOCK_DURATION, LOCK_STATUS,
+    thread_id_name(OWNER_THREAD_ID) as OWNER_THREAD_ID
+    from performance_schema.metadata_locks
+    order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME,
+    LOCK_TYPE, LOCK_DURATION, LOCK_STATUS, OWNER_THREAD_ID;";
+prepare dump_table_handles from
+"select OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME,
+    INTERNAL_LOCK, EXTERNAL_LOCK,
+    thread_id_name(OWNER_THREAD_ID) as OWNER_THREAD_ID
+    from performance_schema.table_handles
+    order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME,
+    INTERNAL_LOCK, EXTERNAL_LOCK, OWNER_THREAD_ID;";
+prepare dump_waits_current from
+"select thread_id_name(THREAD_ID) as THREAD_ID,
+    EVENT_NAME,
+    TIMER_START is not NULL as TIMER_START_SET,
+    TIMER_END is not NULL as TIMER_END_SET,
+    OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME,
+    OPERATION
+    from performance_schema.events_waits_current
+    where event_name = \'wait/lock/metadata/sql/mdl\';";
+prepare dump_waits_history_long from
+"select thread_id_name(THREAD_ID) as THREAD_ID,
+    EVENT_NAME,
+    TIMER_START is not NULL as TIMER_START_SET,
+    TIMER_END is not NULL as TIMER_END_SET,
+    OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME,
+    OPERATION
+    from performance_schema.events_waits_history_long
+    where event_name = \'wait/lock/metadata/sql/mdl\';";
+truncate table performance_schema.events_statements_summary_by_digest;
+flush status;
+flush tables;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value');
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER1
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_WRITE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER1
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	SCHEMA
+OBJECT_SCHEMA	test
+OBJECT_NAME	NULL
+LOCK_TYPE	INTENTION_EXCLUSIVE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	EXCLUSIVE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	PENDING
+OWNER_THREAD_ID	USER2
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_WRITE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER1
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INTERNAL_LOCK	WRITE
+EXTERNAL_LOCK	NULL
+OWNER_THREAD_ID	OTHER
+execute dump_waits_current;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+execute dump_table_handles;
+execute dump_waits_current;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INDEX_NAME	NULL
+OPERATION	metadata lock
+execute dump_waits_history_long;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER1
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	SCHEMA
+OBJECT_SCHEMA	test
+OBJECT_NAME	NULL
+LOCK_TYPE	INTENTION_EXCLUSIVE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_NO_READ_WRITE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	PENDING
+OWNER_THREAD_ID	USER2
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER1
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INTERNAL_LOCK	READ NO INSERT
+EXTERNAL_LOCK	READ EXTERNAL
+OWNER_THREAD_ID	USER1
+execute dump_waits_current;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+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
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	SCHEMA
+OBJECT_SCHEMA	test
+OBJECT_NAME	NULL
+LOCK_TYPE	INTENTION_EXCLUSIVE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_NO_READ_WRITE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INTERNAL_LOCK	WRITE
+EXTERNAL_LOCK	WRITE EXTERNAL
+OWNER_THREAD_ID	USER2
+execute dump_waits_current;
+execute dump_waits_history_long;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+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
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	SCHEMA
+OBJECT_SCHEMA	test
+OBJECT_NAME	NULL
+LOCK_TYPE	INTENTION_EXCLUSIVE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_NO_READ_WRITE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	PENDING
+OWNER_THREAD_ID	USER1
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INTERNAL_LOCK	WRITE
+EXTERNAL_LOCK	WRITE EXTERNAL
+OWNER_THREAD_ID	USER2
+execute dump_waits_current;
+THREAD_ID	USER1
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INDEX_NAME	NULL
+OPERATION	metadata lock
+execute dump_waits_history_long;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER1
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INTERNAL_LOCK	READ NO INSERT
+EXTERNAL_LOCK	READ EXTERNAL
+OWNER_THREAD_ID	USER1
+execute dump_waits_current;
+execute dump_waits_history_long;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INDEX_NAME	NULL
+OPERATION	metadata lock
+THREAD_ID	USER1
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INTERNAL_LOCK	READ NO INSERT
+EXTERNAL_LOCK	NULL
+OWNER_THREAD_ID	OTHER
+execute dump_waits_current;
+execute dump_waits_history_long;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INDEX_NAME	NULL
+OPERATION	metadata lock
+THREAD_ID	USER1
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INDEX_NAME	NULL
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+LOCK_TYPE	SHARED_WRITE
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER1
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	USER LEVEL LOCK
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	test
+LOCK_TYPE	SHARED_NO_WRITE
+LOCK_DURATION	EXPLICIT
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER1
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	USER LEVEL LOCK
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	test
+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	SHARED_NO_WRITE
+LOCK_DURATION	EXPLICIT
+LOCK_STATUS	PENDING
+OWNER_THREAD_ID	USER2
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INTERNAL_LOCK	WRITE LOW PRIORITY
+EXTERNAL_LOCK	NULL
+OWNER_THREAD_ID	OTHER
+execute dump_waits_current;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	USER LEVEL LOCK
+OBJECT_SCHEMA	NULL
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	USER LEVEL LOCK
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	test
+LOCK_TYPE	SHARED_NO_WRITE
+LOCK_DURATION	EXPLICIT
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	USER2
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INTERNAL_LOCK	WRITE LOW PRIORITY
+EXTERNAL_LOCK	NULL
+OWNER_THREAD_ID	OTHER
+execute dump_waits_current;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	USER LEVEL LOCK
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	test
+INDEX_NAME	NULL
+OPERATION	metadata lock
+execute dump_waits_history_long;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	USER LEVEL LOCK
+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
+OBJECT_SCHEMA	test
+OBJECT_NAME	thread_id_name
+LOCK_TYPE	SHARED
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	performance_schema
+OBJECT_NAME	metadata_locks
+LOCK_TYPE	SHARED_READ
+LOCK_DURATION	TRANSACTION
+LOCK_STATUS	GRANTED
+OWNER_THREAD_ID	OTHER
+execute dump_table_handles;
+OBJECT_TYPE	TABLE
+OBJECT_SCHEMA	test
+OBJECT_NAME	t1
+INTERNAL_LOCK	WRITE LOW PRIORITY
+EXTERNAL_LOCK	NULL
+OWNER_THREAD_ID	OTHER
+execute dump_waits_current;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	USER LEVEL LOCK
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	test
+INDEX_NAME	NULL
+OPERATION	metadata lock
+execute dump_waits_history_long;
+THREAD_ID	USER2
+EVENT_NAME	wait/lock/metadata/sql/mdl
+TIMER_START_SET	1
+TIMER_END_SET	1
+OBJECT_TYPE	USER LEVEL LOCK
+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;
+revoke all privileges, grant option from user2@localhost;
+drop user user1@localhost;
+drop user user2@localhost;
+drop function thread_id_name;
+drop prepare dump_metadata_locks;
+drop prepare dump_table_handles;
+drop prepare dump_waits_current;
+drop prepare dump_waits_history_long;
+delete from performance_schema.setup_objects
+where object_schema='mtr';
+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
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate.result b/mysql-test/suite/perfschema/r/memory_aggregate.result
new file mode 100644
index 00000000000..69eb033e74b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/memory_aggregate.result
@@ -0,0 +1,5602 @@
+show global status like "performance_schema_memory_classes_lost";
+Variable_name	Value
+Performance_schema_memory_classes_lost	0
+"================== Step 1 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+user1	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	2	2
+connection con1;
+set GLOBAL query_cache_size=1000*1024;
+select get_lock("marker_1", 10);
+get_lock("marker_1", 10)
+1
+select release_lock("marker_1");
+release_lock("marker_1")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	4
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+user1	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	4
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	3	3
+connection con2;
+set GLOBAL query_cache_size=2000*1024;
+select get_lock("marker_2", 10);
+get_lock("marker_2", 10)
+1
+select release_lock("marker_2");
+release_lock("marker_2")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	3	3
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+"================== MEMORY_BY_THREAD truncated =================="
+"================== Step 5b =================="
+call dump_thread();
+username	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	4	4
+connection con3;
+set GLOBAL query_cache_size=500*1024;
+select get_lock("marker_3", 10);
+get_lock("marker_3", 10)
+1
+select release_lock("marker_3");
+release_lock("marker_3")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	816
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	10
+COUNT_FREE	0
+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	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	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	6
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	816
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	10
+COUNT_FREE	0
+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	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	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	2	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+user4	2	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	6	6
+connection con4;
+set GLOBAL query_cache_size=4000*1024;
+select get_lock("marker_4", 10);
+get_lock("marker_4", 10)
+1
+select release_lock("marker_4");
+release_lock("marker_4")
+1
+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
+select release_lock("marker_5");
+release_lock("marker_5")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	0
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+HIGH_NUMBER_OF_BYTES_USED	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	0
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	16
+HIGH_COUNT_USED	16
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	2	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+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();
+username	user1
+status	not found
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	6
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	16
+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
+user1	localhost	0	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	1	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	1	1
+user3	1	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	9
+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	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	16
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	1	1
+user4	localhost	1	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	1	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	12
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	16
+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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	1	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+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 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_account_by_event_name;
+"================== MEMORY_BY_ACCOUNT truncated =================="
+"================== Step 15 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_user_by_event_name;
+"================== MEMORY_BY_USER truncated =================="
+"================== Step 16 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_host_by_event_name;
+"================== MEMORY_BY_HOST truncated =================="
+"================== Step 17 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_global_by_event_name;
+"================== MEMORY_GLOBAL truncated =================="
+"================== Step 18 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.accounts;
+"================== ACCOUNTS truncated =================="
+"================== Step 19 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.users;
+"================== USERS truncated =================="
+"================== Step 20 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.hosts;
+"================== HOSTS truncated =================="
+"================== Step 21 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	1
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_32bit.result b/mysql-test/suite/perfschema/r/memory_aggregate_32bit.result
new file mode 100644
index 00000000000..2b8ee675650
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_32bit.result
@@ -0,0 +1,5602 @@
+show global status like "performance_schema_memory_classes_lost";
+Variable_name	Value
+Performance_schema_memory_classes_lost	0
+"================== Step 1 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+user1	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	2	2
+connection con1;
+set GLOBAL query_cache_size=1000*1024;
+select get_lock("marker_1", 10);
+get_lock("marker_1", 10)
+1
+select release_lock("marker_1");
+release_lock("marker_1")
+1
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	24576
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+user1	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+status	not found
+username	user4
+status	not found
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+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	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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	24576
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	3	3
+connection con2;
+set GLOBAL query_cache_size=2000*1024;
+select get_lock("marker_2", 10);
+get_lock("marker_2", 10)
+1
+select release_lock("marker_2");
+release_lock("marker_2")
+1
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	384
+HIGH_NUMBER_OF_BYTES_USED	400
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	49152
+SUM_NUMBER_OF_BYTES_FREE	24576
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	384
+HIGH_NUMBER_OF_BYTES_USED	400
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	3	3
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+"================== MEMORY_BY_THREAD truncated =================="
+"================== Step 5b =================="
+call dump_thread();
+username	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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	192
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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
+status	not found
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	384
+HIGH_NUMBER_OF_BYTES_USED	400
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	49152
+SUM_NUMBER_OF_BYTES_FREE	24576
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	384
+HIGH_NUMBER_OF_BYTES_USED	400
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+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	192
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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	192
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+status	not found
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	2
+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	384
+HIGH_NUMBER_OF_BYTES_USED	400
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	49152
+SUM_NUMBER_OF_BYTES_FREE	24576
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	384
+HIGH_NUMBER_OF_BYTES_USED	400
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	4	4
+connection con3;
+set GLOBAL query_cache_size=500*1024;
+select get_lock("marker_3", 10);
+get_lock("marker_3", 10)
+1
+select release_lock("marker_3");
+release_lock("marker_3")
+1
+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	192
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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	192
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+status	not found
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	73728
+SUM_NUMBER_OF_BYTES_FREE	49152
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+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	192
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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	192
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	73728
+SUM_NUMBER_OF_BYTES_FREE	49152
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	2	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+user4	2	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	6	6
+connection con4;
+set GLOBAL query_cache_size=4000*1024;
+select get_lock("marker_4", 10);
+get_lock("marker_4", 10)
+1
+select release_lock("marker_4");
+release_lock("marker_4")
+1
+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
+select release_lock("marker_5");
+release_lock("marker_5")
+1
+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	192
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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	192
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	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	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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	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	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	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	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	35216
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	16
+HIGH_COUNT_USED	16
+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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	35216
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	16
+HIGH_COUNT_USED	16
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	2	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+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();
+username	user1
+status	not found
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	3
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	200
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	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	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	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	200
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	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	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	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	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	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	16
+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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	16
+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
+user1	localhost	0	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	1	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	1	1
+user3	1	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	200
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	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	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	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	200
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	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	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	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	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	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	16
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	16
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	1	1
+user4	localhost	1	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	1	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+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	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	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	200
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	3
+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	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	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	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	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	200
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	3
+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	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	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	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	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	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	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	16
+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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	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	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	16
+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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	1	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	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	200
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+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	400
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	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	200
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+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	400
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	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	1000
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	1000
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+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 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	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	200
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+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	400
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	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	200
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+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	400
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	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	1000
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	1000
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_account_by_event_name;
+"================== MEMORY_BY_ACCOUNT truncated =================="
+"================== Step 15 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+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	200
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+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	400
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	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	1000
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	1000
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_user_by_event_name;
+"================== MEMORY_BY_USER truncated =================="
+"================== Step 16 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+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	1000
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	1000
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_host_by_event_name;
+"================== MEMORY_BY_HOST truncated =================="
+"================== Step 17 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	73728
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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	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	1000
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_global_by_event_name;
+"================== MEMORY_GLOBAL truncated =================="
+"================== Step 18 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	24576
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.accounts;
+"================== ACCOUNTS truncated =================="
+"================== Step 19 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	24576
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.users;
+"================== USERS truncated =================="
+"================== Step 20 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	24576
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.hosts;
+"================== HOSTS truncated =================="
+"================== Step 21 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	24576
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	1
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_no_a.result b/mysql-test/suite/perfschema/r/memory_aggregate_no_a.result
new file mode 100644
index 00000000000..b5c8e1cd3c7
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_a.result
@@ -0,0 +1,4014 @@
+show global status like "performance_schema_memory_classes_lost";
+Variable_name	Value
+Performance_schema_memory_classes_lost	0
+"================== Step 1 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+root	1	1
+user1	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	2	2
+connection con1;
+set GLOBAL query_cache_size=1000*1024;
+select get_lock("marker_1", 10);
+get_lock("marker_1", 10)
+1
+select release_lock("marker_1");
+release_lock("marker_1")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	4
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+root	1	1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	4
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+root	1	1
+user1	1	1
+user2	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	3	3
+connection con2;
+set GLOBAL query_cache_size=2000*1024;
+select get_lock("marker_2", 10);
+get_lock("marker_2", 10)
+1
+select release_lock("marker_2");
+release_lock("marker_2")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	3	3
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+"================== MEMORY_BY_THREAD truncated =================="
+"================== Step 5b =================="
+call dump_thread();
+username	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	4	4
+connection con3;
+set GLOBAL query_cache_size=500*1024;
+select get_lock("marker_3", 10);
+get_lock("marker_3", 10)
+1
+select release_lock("marker_3");
+release_lock("marker_3")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	784
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	10
+COUNT_FREE	0
+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	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	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+root	1	1
+user1	1	1
+user2	1	1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	6
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	784
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	10
+COUNT_FREE	0
+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	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	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+user4	2	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	6	6
+connection con4;
+set GLOBAL query_cache_size=4000*1024;
+select get_lock("marker_4", 10);
+get_lock("marker_4", 10)
+1
+select release_lock("marker_4");
+release_lock("marker_4")
+1
+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
+select release_lock("marker_5");
+release_lock("marker_5")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	0
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	0
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	16
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+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();
+username	user1
+status	not found
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	6
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	1	1
+user3	1	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	9
+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	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	16
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	1	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	12
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+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 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_account_by_event_name;
+"================== MEMORY_BY_ACCOUNT truncated =================="
+"================== Step 15 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_user_by_event_name;
+"================== MEMORY_BY_USER truncated =================="
+"================== Step 16 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_host_by_event_name;
+"================== MEMORY_BY_HOST truncated =================="
+"================== Step 17 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_global_by_event_name;
+"================== MEMORY_GLOBAL truncated =================="
+"================== Step 18 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.accounts;
+"================== ACCOUNTS truncated =================="
+"================== Step 19 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.users;
+"================== USERS truncated =================="
+"================== Step 20 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+root	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.hosts;
+"================== HOSTS truncated =================="
+"================== Step 21 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+root	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	1
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
new file mode 100644
index 00000000000..cc0e0c03dcf
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_h.result
@@ -0,0 +1,3464 @@
+show global status like "performance_schema_memory_classes_lost";
+Variable_name	Value
+Performance_schema_memory_classes_lost	0
+"================== Step 1 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+root	1	1
+user1	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con1;
+set GLOBAL query_cache_size=1000*1024;
+select get_lock("marker_1", 10);
+get_lock("marker_1", 10)
+1
+select release_lock("marker_1");
+release_lock("marker_1")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+root	1	1
+user1	1	1
+user2	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con2;
+set GLOBAL query_cache_size=2000*1024;
+select get_lock("marker_2", 10);
+get_lock("marker_2", 10)
+1
+select release_lock("marker_2");
+release_lock("marker_2")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+"================== MEMORY_BY_THREAD truncated =================="
+"================== Step 5b =================="
+call dump_thread();
+username	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con3;
+set GLOBAL query_cache_size=500*1024;
+select get_lock("marker_3", 10);
+get_lock("marker_3", 10)
+1
+select release_lock("marker_3");
+release_lock("marker_3")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+root	1	1
+user1	1	1
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+user4	2	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con4;
+set GLOBAL query_cache_size=4000*1024;
+select get_lock("marker_4", 10);
+get_lock("marker_4", 10)
+1
+select release_lock("marker_4");
+release_lock("marker_4")
+1
+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
+select release_lock("marker_5");
+release_lock("marker_5")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	0
+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	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	16
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	1	1
+user2	1	1
+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();
+username	user1
+status	not found
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	1	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	16
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+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 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_by_account_by_event_name;
+"================== MEMORY_BY_ACCOUNT truncated =================="
+"================== Step 15 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_by_user_by_event_name;
+"================== MEMORY_BY_USER truncated =================="
+"================== Step 16 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_by_host_by_event_name;
+"================== MEMORY_BY_HOST truncated =================="
+"================== Step 17 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_global_by_event_name;
+"================== MEMORY_GLOBAL truncated =================="
+"================== Step 18 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.accounts;
+"================== ACCOUNTS truncated =================="
+"================== Step 19 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.users;
+"================== USERS truncated =================="
+"================== Step 20 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+root	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.hosts;
+"================== HOSTS truncated =================="
+"================== Step 21 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+root	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
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
new file mode 100644
index 00000000000..8b24b5b565b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u.result
@@ -0,0 +1,2442 @@
+show global status like "performance_schema_memory_classes_lost";
+Variable_name	Value
+Performance_schema_memory_classes_lost	0
+"================== Step 1 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+localhost	1	1
+connect  con1, localhost, user1, , ;
+"================== con1 connected =================="
+connection default;
+"================== Step 2 =================="
+call dump_thread();
+username	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+localhost	2	2
+connection con1;
+set GLOBAL query_cache_size=1000*1024;
+select get_lock("marker_1", 10);
+get_lock("marker_1", 10)
+1
+select release_lock("marker_1");
+release_lock("marker_1")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	4
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	4
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+localhost	3	3
+connection con2;
+set GLOBAL query_cache_size=2000*1024;
+select get_lock("marker_2", 10);
+get_lock("marker_2", 10)
+1
+select release_lock("marker_2");
+release_lock("marker_2")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+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
+localhost	3	3
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+"================== MEMORY_BY_THREAD truncated =================="
+"================== Step 5b =================="
+call dump_thread();
+username	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+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
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+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
+localhost	4	4
+connection con3;
+set GLOBAL query_cache_size=500*1024;
+select get_lock("marker_3", 10);
+get_lock("marker_3", 10)
+1
+select release_lock("marker_3");
+release_lock("marker_3")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	6
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	784
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	10
+COUNT_FREE	0
+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	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	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	6
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	784
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	10
+COUNT_FREE	0
+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	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	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+localhost	6	6
+connection con4;
+set GLOBAL query_cache_size=4000*1024;
+select get_lock("marker_4", 10);
+get_lock("marker_4", 10)
+1
+select release_lock("marker_4");
+release_lock("marker_4")
+1
+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
+select release_lock("marker_5");
+release_lock("marker_5")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	5
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	0
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	16
+HIGH_COUNT_USED	16
+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
+localhost	6	6
+disconnect con1;
+disconnect con5;
+connection default;
+"================== con1/con5 disconnected =================="
+"================== Step 10 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	7
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	6
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	16
+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
+localhost	4	6
+disconnect con2;
+connection default;
+"================== con2 disconnected =================="
+"================== Step 11 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	8
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	9
+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	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	16
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+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
+localhost	3	6
+disconnect con3;
+connection default;
+"================== con3 disconnected =================="
+"================== Step 12 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	9
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	12
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	16
+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
+localhost	2	6
+disconnect con4;
+connection default;
+"================== con4 disconnected =================="
+"================== Step 13 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+localhost	1	6
+connection default;
+truncate performance_schema.memory_summary_by_thread_by_event_name;
+"================== MEMORY_BY_THREAD truncated =================="
+"================== Step 14 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+localhost	1	6
+truncate performance_schema.memory_summary_by_account_by_event_name;
+"================== MEMORY_BY_ACCOUNT truncated =================="
+"================== Step 15 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+localhost	1	6
+truncate performance_schema.memory_summary_by_user_by_event_name;
+"================== MEMORY_BY_USER truncated =================="
+"================== Step 16 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	1328
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+localhost	1	6
+truncate performance_schema.memory_summary_by_host_by_event_name;
+"================== MEMORY_BY_HOST truncated =================="
+"================== Step 17 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+localhost	1	6
+truncate performance_schema.memory_summary_global_by_event_name;
+"================== MEMORY_GLOBAL truncated =================="
+"================== Step 18 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+localhost	1	6
+truncate performance_schema.accounts;
+"================== ACCOUNTS truncated =================="
+"================== Step 19 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+localhost	1	6
+truncate performance_schema.users;
+"================== USERS truncated =================="
+"================== Step 20 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+localhost	1	6
+truncate performance_schema.hosts;
+"================== HOSTS truncated =================="
+"================== Step 21 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+localhost	1	1
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
new file mode 100644
index 00000000000..45cbaf88372
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u_no_h.result
@@ -0,0 +1,1892 @@
+show global status like "performance_schema_memory_classes_lost";
+Variable_name	Value
+Performance_schema_memory_classes_lost	0
+"================== Step 1 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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;
+select get_lock("marker_1", 10);
+get_lock("marker_1", 10)
+1
+select release_lock("marker_1");
+release_lock("marker_1")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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;
+select get_lock("marker_2", 10);
+get_lock("marker_2", 10)
+1
+select release_lock("marker_2");
+release_lock("marker_2")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+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
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+"================== MEMORY_BY_THREAD truncated =================="
+"================== Step 5b =================="
+call dump_thread();
+username	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+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  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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+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 con3;
+set GLOBAL query_cache_size=500*1024;
+select get_lock("marker_3", 10);
+get_lock("marker_3", 10)
+1
+select release_lock("marker_3");
+release_lock("marker_3")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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;
+select get_lock("marker_4", 10);
+get_lock("marker_4", 10)
+1
+select release_lock("marker_4");
+release_lock("marker_4")
+1
+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
+select release_lock("marker_5");
+release_lock("marker_5")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	16
+HIGH_COUNT_USED	16
+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();
+username	user1
+status	not found
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	16
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	16
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	16
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+truncate performance_schema.memory_summary_by_account_by_event_name;
+"================== MEMORY_BY_ACCOUNT truncated =================="
+"================== Step 15 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+truncate performance_schema.memory_summary_by_user_by_event_name;
+"================== MEMORY_BY_USER truncated =================="
+"================== Step 16 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+truncate performance_schema.memory_summary_by_host_by_event_name;
+"================== MEMORY_BY_HOST truncated =================="
+"================== Step 17 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	8
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	35120
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	16
+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
+truncate performance_schema.memory_summary_global_by_event_name;
+"================== MEMORY_GLOBAL truncated =================="
+"================== Step 18 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+truncate performance_schema.accounts;
+"================== ACCOUNTS truncated =================="
+"================== Step 19 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+truncate performance_schema.users;
+"================== USERS truncated =================="
+"================== Step 20 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+truncate performance_schema.hosts;
+"================== HOSTS truncated =================="
+"================== Step 21 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_no_h.result b/mysql-test/suite/perfschema/r/memory_aggregate_no_h.result
new file mode 100644
index 00000000000..35d528bf63c
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_h.result
@@ -0,0 +1,5052 @@
+show global status like "performance_schema_memory_classes_lost";
+Variable_name	Value
+Performance_schema_memory_classes_lost	0
+"================== Step 1 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+user1	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con1;
+set GLOBAL query_cache_size=1000*1024;
+select get_lock("marker_1", 10);
+get_lock("marker_1", 10)
+1
+select release_lock("marker_1");
+release_lock("marker_1")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+user1	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con2;
+set GLOBAL query_cache_size=2000*1024;
+select get_lock("marker_2", 10);
+get_lock("marker_2", 10)
+1
+select release_lock("marker_2");
+release_lock("marker_2")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+"================== MEMORY_BY_THREAD truncated =================="
+"================== Step 5b =================="
+call dump_thread();
+username	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con3;
+set GLOBAL query_cache_size=500*1024;
+select get_lock("marker_3", 10);
+get_lock("marker_3", 10)
+1
+select release_lock("marker_3");
+release_lock("marker_3")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	2	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+user3	1	1
+user4	2	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+connection con4;
+set GLOBAL query_cache_size=4000*1024;
+select get_lock("marker_4", 10);
+get_lock("marker_4", 10)
+1
+select release_lock("marker_4");
+release_lock("marker_4")
+1
+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
+select release_lock("marker_5");
+release_lock("marker_5")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	0
+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	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	16
+HIGH_COUNT_USED	16
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	2	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	1	1
+user2	1	1
+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();
+username	user1
+status	not found
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	16
+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
+user1	localhost	0	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	1	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	1	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	16
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	1	1
+user4	localhost	1	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	16
+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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	1	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+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 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_by_account_by_event_name;
+"================== MEMORY_BY_ACCOUNT truncated =================="
+"================== Step 15 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	14048
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_by_user_by_event_name;
+"================== MEMORY_BY_USER truncated =================="
+"================== Step 16 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_by_host_by_event_name;
+"================== MEMORY_BY_HOST truncated =================="
+"================== Step 17 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_global_by_event_name;
+"================== MEMORY_GLOBAL truncated =================="
+"================== Step 18 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.accounts;
+"================== ACCOUNTS truncated =================="
+"================== Step 19 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+USER	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+user1	0	1
+user2	0	1
+user3	0	1
+user4	0	2
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.users;
+"================== USERS truncated =================="
+"================== Step 20 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.hosts;
+"================== HOSTS truncated =================="
+"================== Step 21 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	1	1
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
diff --git a/mysql-test/suite/perfschema/r/memory_aggregate_no_u.result b/mysql-test/suite/perfschema/r/memory_aggregate_no_u.result
new file mode 100644
index 00000000000..1f800ce4ba6
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_u.result
@@ -0,0 +1,4030 @@
+show global status like "performance_schema_memory_classes_lost";
+Variable_name	Value
+Performance_schema_memory_classes_lost	0
+"================== Step 1 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+user1	localhost	1	1
+execute dump_users;
+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;
+select get_lock("marker_1", 10);
+get_lock("marker_1", 10)
+1
+select release_lock("marker_1");
+release_lock("marker_1")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	4
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+user1	localhost	1	1
+execute dump_users;
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	4
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+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;
+select get_lock("marker_2", 10);
+get_lock("marker_2", 10)
+1
+select release_lock("marker_2");
+release_lock("marker_2")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	3	3
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+"================== MEMORY_BY_THREAD truncated =================="
+"================== Step 5b =================="
+call dump_thread();
+username	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+execute dump_users;
+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;
+select get_lock("marker_3", 10);
+get_lock("marker_3", 10)
+1
+select release_lock("marker_3");
+release_lock("marker_3")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	6
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	816
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	10
+COUNT_FREE	0
+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	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	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+execute dump_users;
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	6
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	816
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	10
+COUNT_FREE	0
+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	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	6
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	2	2
+execute dump_users;
+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;
+select get_lock("marker_4", 10);
+get_lock("marker_4", 10)
+1
+select release_lock("marker_4");
+release_lock("marker_4")
+1
+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
+select release_lock("marker_5");
+release_lock("marker_5")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	0
+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	14048
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	5
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+HIGH_NUMBER_OF_BYTES_USED	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	0
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	16
+HIGH_COUNT_USED	16
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	2	2
+execute dump_users;
+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();
+username	user1
+status	not found
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	7
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+HIGH_NUMBER_OF_BYTES_USED	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	6
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	16
+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
+user1	localhost	0	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	1	2
+execute dump_users;
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	8
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	9
+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	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	16
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	1	1
+user4	localhost	1	2
+execute dump_users;
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	7024
+HIGH_NUMBER_OF_BYTES_USED	14048
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	9
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	12
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	16
+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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	1	2
+execute dump_users;
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	14048
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+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 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	14048
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_account_by_event_name;
+"================== MEMORY_BY_ACCOUNT truncated =================="
+"================== Step 15 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_user_by_event_name;
+"================== MEMORY_BY_USER truncated =================="
+"================== Step 16 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	10
+COUNT_FREE	10
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_by_host_by_event_name;
+"================== MEMORY_BY_HOST truncated =================="
+"================== Step 17 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.memory_summary_global_by_event_name;
+"================== MEMORY_GLOBAL truncated =================="
+"================== Step 18 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.accounts;
+"================== ACCOUNTS truncated =================="
+"================== Step 19 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.users;
+"================== USERS truncated =================="
+"================== Step 20 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	6
+truncate performance_schema.hosts;
+"================== HOSTS truncated =================="
+"================== Step 21 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	1
+COUNT_FREE	0
+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	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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+localhost	1	1
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
new file mode 100644
index 00000000000..b1ac5f24ec9
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/memory_aggregate_no_u_no_h.result
@@ -0,0 +1,3480 @@
+show global status like "performance_schema_memory_classes_lost";
+Variable_name	Value
+Performance_schema_memory_classes_lost	0
+"================== Step 1 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+user1	localhost	1	1
+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;
+select get_lock("marker_1", 10);
+get_lock("marker_1", 10)
+1
+select release_lock("marker_1");
+release_lock("marker_1")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+user1	localhost	1	1
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	7120
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	4
+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
+user1	localhost	1	1
+user2	localhost	1	1
+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;
+select get_lock("marker_2", 10);
+get_lock("marker_2", 10)
+1
+select release_lock("marker_2");
+release_lock("marker_2")
+1
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+"================== MEMORY_BY_THREAD truncated =================="
+"================== Step 5b =================="
+call dump_thread();
+username	user1
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	7024
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	4
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	65536
+SUM_NUMBER_OF_BYTES_FREE	32768
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	7
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	14144
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	7
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	14144
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+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;
+select get_lock("marker_3", 10);
+get_lock("marker_3", 10)
+1
+select release_lock("marker_3");
+release_lock("marker_3")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	4
+SUM_NUMBER_OF_BYTES_ALLOC	98304
+SUM_NUMBER_OF_BYTES_FREE	65536
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+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
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	7024
+HIGH_NUMBER_OF_BYTES_USED	7024
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	816
+SUM_NUMBER_OF_BYTES_FREE	48
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	6
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	21168
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	10
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	2	2
+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;
+select get_lock("marker_4", 10);
+get_lock("marker_4", 10)
+1
+select release_lock("marker_4");
+release_lock("marker_4")
+1
+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
+select release_lock("marker_5");
+release_lock("marker_5")
+1
+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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user1
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	32
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	0
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	80
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	5
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	1280
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	16
+HIGH_COUNT_USED	16
+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
+user1	localhost	1	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	2	2
+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();
+username	user1
+status	not found
+username	user2
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	1
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	256
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+LOW_NUMBER_OF_BYTES_USED	256
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	256
+username	user2
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+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	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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	592
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	768
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	14048
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	10
+HIGH_COUNT_USED	16
+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
+user1	localhost	0	1
+user2	localhost	1	1
+user3	localhost	1	1
+user4	localhost	1	2
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user3
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	848
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	512
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	21072
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	7
+HIGH_COUNT_USED	16
+LOW_NUMBER_OF_BYTES_USED	96
+CURRENT_NUMBER_OF_BYTES_USED	14144
+HIGH_NUMBER_OF_BYTES_USED	35216
+execute dump_accounts;
+USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+root	localhost	1	1
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	1	1
+user4	localhost	1	2
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	1
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	16
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	272
+username	user4
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	7024
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	3
+HIGH_COUNT_USED	3
+LOW_NUMBER_OF_BYTES_USED	0
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	3
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	288
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	4
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+HIGH_NUMBER_OF_BYTES_USED	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	3
+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	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	8
+COUNT_FREE	6
+SUM_NUMBER_OF_BYTES_ALLOC	131072
+SUM_NUMBER_OF_BYTES_FREE	98304
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1104
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	10
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	256
+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	35216
+SUM_NUMBER_OF_BYTES_FREE	28096
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	4
+HIGH_COUNT_USED	16
+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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	1	2
+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();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	14048
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+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 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+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	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	2
+COUNT_FREE	2
+SUM_NUMBER_OF_BYTES_ALLOC	272
+SUM_NUMBER_OF_BYTES_FREE	272
+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	272
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	3
+COUNT_FREE	3
+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	7024
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	4
+COUNT_FREE	4
+SUM_NUMBER_OF_BYTES_ALLOC	544
+SUM_NUMBER_OF_BYTES_FREE	544
+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	544
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	6
+COUNT_FREE	6
+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	14048
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_by_account_by_event_name;
+"================== MEMORY_BY_ACCOUNT truncated =================="
+"================== Step 15 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_by_user_by_event_name;
+"================== MEMORY_BY_USER truncated =================="
+"================== Step 16 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_by_host_by_event_name;
+"================== MEMORY_BY_HOST truncated =================="
+"================== Step 17 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+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	2
+HIGH_COUNT_USED	2
+LOW_NUMBER_OF_BYTES_USED	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	1360
+SUM_NUMBER_OF_BYTES_FREE	1360
+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	1360
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	16
+COUNT_FREE	15
+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	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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.memory_summary_global_by_event_name;
+"================== MEMORY_GLOBAL truncated =================="
+"================== Step 18 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user1
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user2
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user3
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/User_level_lock
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+USER	user4
+HOST	localhost
+EVENT_NAME	memory/sql/user_var_entry::value
+COUNT_ALLOC	0
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+HIGH_NUMBER_OF_BYTES_USED	0
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+user1	localhost	0	1
+user2	localhost	0	1
+user3	localhost	0	1
+user4	localhost	0	2
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.accounts;
+"================== ACCOUNTS truncated =================="
+"================== Step 19 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.users;
+"================== USERS truncated =================="
+"================== Step 20 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+truncate performance_schema.hosts;
+"================== HOSTS truncated =================="
+"================== Step 21 =================="
+call dump_thread();
+username	user1
+status	not found
+username	user2
+status	not found
+username	user3
+status	not found
+username	user4
+status	not found
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+EVENT_NAME	memory/sql/Query_cache
+COUNT_ALLOC	2
+COUNT_FREE	0
+SUM_NUMBER_OF_BYTES_ALLOC	32768
+SUM_NUMBER_OF_BYTES_FREE	0
+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
+SUM_NUMBER_OF_BYTES_ALLOC	0
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	0
+CURRENT_COUNT_USED	0
+HIGH_COUNT_USED	0
+LOW_NUMBER_OF_BYTES_USED	0
+CURRENT_NUMBER_OF_BYTES_USED	0
+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	96
+SUM_NUMBER_OF_BYTES_FREE	0
+LOW_COUNT_USED	1
+CURRENT_COUNT_USED	1
+HIGH_COUNT_USED	1
+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
+execute dump_users;
+USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+execute dump_hosts;
+HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
diff --git a/mysql-test/suite/perfschema/r/memory_table_io.result b/mysql-test/suite/perfschema/r/memory_table_io.result
index 7942015f618..033c355dfa3 100644
--- a/mysql-test/suite/perfschema/r/memory_table_io.result
+++ b/mysql-test/suite/perfschema/r/memory_table_io.result
@@ -70,65 +70,69 @@ 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
-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		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_%';
 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
 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 d390ba67b5f..e65cc45dc84 100644
--- a/mysql-test/suite/perfschema/r/merge_table_io.result
+++ b/mysql-test/suite/perfschema/r/merge_table_io.result
@@ -96,69 +96,75 @@ 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
-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		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_%';
 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
 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 2e4d21d625a..bed8d93af25 100644
--- a/mysql-test/suite/perfschema/r/misc.result
+++ b/mysql-test/suite/perfschema/r/misc.result
@@ -92,6 +92,20 @@ object_schema	object_name	index_name	count_fetch	count_insert	count_update	count
 test	t_60905	i	2	0	0	1
 test	t_60905	NULL	5	5	0	1
 DROP TABLE t_60905;
+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	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
+show events from performance_schema;
+Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
+show events where Db= 'performance_schema';
+Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
+use test;
 use test;
 truncate performance_schema.events_statements_history;
 truncate performance_schema.events_statements_history_long;
diff --git a/mysql-test/suite/perfschema/r/multi_table_io.result b/mysql-test/suite/perfschema/r/multi_table_io.result
index 929e1791c61..54dc0fba3d1 100644
--- a/mysql-test/suite/perfschema/r/multi_table_io.result
+++ b/mysql-test/suite/perfschema/r/multi_table_io.result
@@ -52,42 +52,56 @@ 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
-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
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
+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_%';
 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
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/myisam_file_io.result b/mysql-test/suite/perfschema/r/myisam_file_io.result
index ea1e0bd52b8..ec03a16e8a1 100644
--- a/mysql-test/suite/perfschema/r/myisam_file_io.result
+++ b/mysql-test/suite/perfschema/r/myisam_file_io.result
@@ -21,29 +21,29 @@ where operation not like "tell"
   having short_name <> ""
   order by thread_id, event_id;
 event_name	short_source	operation	number_of_bytes	short_name
-wait/io/file/myisam/kfile	mi_create.c:	create	NULL	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_create.c:	create	NULL	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_open.c:	write	176	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	write	100	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	write	7	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	write	7	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	write	7	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_create.c:	chsize	1024	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_create.c:	close	NULL	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_create.c:	close	NULL	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	open	NULL	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	read	24	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	seek	NULL	no_index_tab.MYI
-wait/io/file/myisam/kfile	mi_open.c:	read	297	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_open.c:	open	NULL	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_locking.c:	write	3	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_dynrec.c:	write	20	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_open.c:	write	124	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_dynrec.c:	write	20	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_open.c:	write	124	no_index_tab.MYI
-wait/io/file/myisam/dfile	mi_dynrec.c:	write	20	no_index_tab.MYD
-wait/io/file/myisam/kfile	mi_open.c:	write	124	no_index_tab.MYI
-show status like 'performance_schema_%';
+wait/io/file/myisam/kfile		create	NULL	no_index_tab.MYI
+wait/io/file/myisam/dfile		create	NULL	no_index_tab.MYD
+wait/io/file/myisam/kfile		write	176	no_index_tab.MYI
+wait/io/file/myisam/kfile		write	100	no_index_tab.MYI
+wait/io/file/myisam/kfile		write	7	no_index_tab.MYI
+wait/io/file/myisam/kfile		write	7	no_index_tab.MYI
+wait/io/file/myisam/kfile		write	7	no_index_tab.MYI
+wait/io/file/myisam/kfile		chsize	1024	no_index_tab.MYI
+wait/io/file/myisam/dfile		close	NULL	no_index_tab.MYD
+wait/io/file/myisam/kfile		close	NULL	no_index_tab.MYI
+wait/io/file/myisam/kfile		open	NULL	no_index_tab.MYI
+wait/io/file/myisam/kfile		read	24	no_index_tab.MYI
+wait/io/file/myisam/kfile		seek	NULL	no_index_tab.MYI
+wait/io/file/myisam/kfile		read	297	no_index_tab.MYI
+wait/io/file/myisam/dfile		open	NULL	no_index_tab.MYD
+wait/io/file/myisam/kfile		write	3	no_index_tab.MYI
+wait/io/file/myisam/dfile		write	20	no_index_tab.MYD
+wait/io/file/myisam/kfile		write	124	no_index_tab.MYI
+wait/io/file/myisam/dfile		write	20	no_index_tab.MYD
+wait/io/file/myisam/kfile		write	124	no_index_tab.MYI
+wait/io/file/myisam/dfile		write	20	no_index_tab.MYD
+wait/io/file/myisam/kfile		write	124	no_index_tab.MYI
+show global status like 'performance_schema_%';
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -53,9 +53,15 @@ 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
@@ -65,6 +71,7 @@ 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
diff --git a/mysql-test/suite/perfschema/r/myisam_table_io.result b/mysql-test/suite/perfschema/r/myisam_table_io.result
index 97a099581d4..9e5d95683ed 100644
--- a/mysql-test/suite/perfschema/r/myisam_table_io.result
+++ b/mysql-test/suite/perfschema/r/myisam_table_io.result
@@ -70,63 +70,69 @@ 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
-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		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_%';
 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
 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 37681757973..e3137d634a6 100644
--- a/mysql-test/suite/perfschema/r/nesting.result
+++ b/mysql-test/suite/perfschema/r/nesting.result
@@ -40,7 +40,7 @@ where sql_text like "%MARKER_END%" and thread_id = @con1_tid);
 select (@marker_end is not null) as expected;
 expected
 1
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -50,9 +50,15 @@ 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
@@ -62,6 +68,7 @@ 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
@@ -108,20 +115,20 @@ and (end_event_id <= @marker_end)
 order by relative_event_id asc;
 relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	relative_nesting_event_id
 0	20	statement/sql/select	select "MARKER_BEGIN" as marker	NULL	NULL
-1	4	stage/sql/Init	(stage)	STATEMENT	0
+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
-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
@@ -130,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
@@ -152,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
@@ -176,57 +183,57 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 66	85	statement/sql/select	select "This is the first part of a multi query" as payload;
 select "And this is the second part of a multi query" as payload;
 select "With a third part to make things complete" as payload	NULL	NULL
-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
@@ -235,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
diff --git a/mysql-test/suite/perfschema/r/no_threads.result b/mysql-test/suite/perfschema/r/no_threads.result
index f78667f4f01..21991b15931 100644
--- a/mysql-test/suite/perfschema/r/no_threads.result
+++ b/mysql-test/suite/perfschema/r/no_threads.result
@@ -6,17 +6,20 @@ drop table if exists test.t1;
 truncate table performance_schema.events_waits_current;
 truncate table performance_schema.events_waits_history;
 truncate table performance_schema.events_waits_history_long;
-show variables like "thread_handling";
+show global variables like "thread_handling";
 Variable_name	Value
 thread_handling	no-threads
+show status like "Performance_schema_thread_instances_lost";
+Variable_name	Value
+Performance_schema_thread_instances_lost	0
 create table test.t1(a int) engine=MYISAM;
-show variables like "performance_schema";
+show global variables like "performance_schema";
 Variable_name	Value
 performance_schema	ON
-show variables like "performance_schema_max_thread%";
+show global variables like "performance_schema_max_thread%";
 Variable_name	Value
 performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	10
+performance_schema_max_thread_instances	50
 select count(*) from performance_schema.threads
 where name like "thread/sql/main";
 count(*)
@@ -29,16 +32,16 @@ select event_name, operation,
 left(source, locate(":", source)) as short_source
 from performance_schema.events_waits_current;
 event_name	operation	short_source
-wait/synch/mutex/mysys/THR_LOCK_myisam	lock	mi_create.c:
+wait/synch/mutex/mysys/THR_LOCK_myisam	lock	
 select event_name, operation,
 left(source, locate(":", source)) as short_source
 from performance_schema.events_waits_history;
 event_name	operation	short_source
-wait/synch/mutex/mysys/THR_LOCK_myisam	lock	mi_create.c:
+wait/synch/mutex/mysys/THR_LOCK_myisam	lock	
 select event_name, operation,
 left(source, locate(":", source)) as short_source
 from performance_schema.events_waits_history_long;
 event_name	operation	short_source
-wait/synch/mutex/mysys/THR_LOCK_myisam	lock	mi_create.c:
+wait/synch/mutex/mysys/THR_LOCK_myisam	lock	
 update performance_schema.setup_instruments set enabled='YES';
 drop table test.t1;
diff --git a/mysql-test/suite/perfschema/r/one_thread_per_con.result b/mysql-test/suite/perfschema/r/one_thread_per_con.result
index 03966ad8556..649243db831 100644
--- a/mysql-test/suite/perfschema/r/one_thread_per_con.result
+++ b/mysql-test/suite/perfschema/r/one_thread_per_con.result
@@ -8,7 +8,7 @@ drop table if exists test.t1;
 drop table if exists test.t2;
 drop table if exists test.t3;
 truncate table performance_schema.events_waits_history_long;
-show variables like "thread_handling";
+show global variables like "thread_handling";
 Variable_name	Value
 thread_handling	one-thread-per-connection
 connection con1;
@@ -20,19 +20,19 @@ create table test.t3(a int) engine=MYISAM;
 connection default;
 execute stmt_dump_events using @tid;
 event_name	short_source	operation	number_of_bytes
-wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam		lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/one_connection
 execute stmt_dump_events using @tid;
 event_name	short_source	operation	number_of_bytes
-wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam		lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/one_connection
 execute stmt_dump_events using @tid;
 event_name	short_source	operation	number_of_bytes
-wait/synch/mutex/mysys/THR_LOCK_myisam	mi_create.c:	lock	NULL
+wait/synch/mutex/mysys/THR_LOCK_myisam		lock	NULL
 execute stmt_dump_thread using @tid;
 name
 thread/sql/one_connection
diff --git a/mysql-test/suite/perfschema/r/ortho_iter.result b/mysql-test/suite/perfschema/r/ortho_iter.result
index dfd31a80b3f..9489c1049e5 100644
--- a/mysql-test/suite/perfschema/r/ortho_iter.result
+++ b/mysql-test/suite/perfschema/r/ortho_iter.result
@@ -3,14 +3,25 @@ truncate table performance_schema.events_statements_summary_by_digest;
 flush status;
 create procedure check_instrument(in instr_name varchar(128))
 begin
+declare save_count_expected integer;
 declare count_expected integer;
-declare count_actual integer;
+declare count_builtin_expected integer;
+declare count_global_expected integer;
 declare is_wait integer;
+declare is_wait_file integer;
+declare is_wait_socket integer;
 declare is_stage integer;
 declare is_statement integer;
+declare is_transaction integer;
+declare is_memory integer;
 declare is_wait_table integer;
+declare is_wait_file_table integer;
+declare is_wait_socket_table integer;
 declare is_stage_table integer;
 declare is_statement_table integer;
+declare is_transaction_table integer;
+declare is_memory_table integer;
+declare is_memory_global_table integer;
 declare pfs_table_name varchar(64);
 declare msg varchar(512);
 declare msg_detail varchar(512);
@@ -21,19 +32,53 @@ declare debug integer default 0;
 declare pfs_cursor CURSOR FOR
 select table_name from information_schema.tables
 where table_schema= 'performance_schema'
-      and table_name like "events_%_by_event_name%"
+      and table_name like "%_by_event_name%"
       order by table_name;
 declare continue handler for sqlstate '02000'
     set done = 1;
-select (instr_name like "wait/%") or (instr_name like "idle/%") into is_wait;
+select (instr_name like "wait/%") or (instr_name like "idle") into is_wait;
+select (instr_name like "wait/io/file/%") into is_wait_file;
+select (instr_name like "wait/io/socket/%") into is_wait_socket;
 select (instr_name like "stage/%") into is_stage;
 select (instr_name like "statement/%") into is_statement;
-select instr_name, is_wait, is_stage, is_statement;
+select (instr_name like "memory/%") into is_memory;
+select (instr_name like "transaction") into is_transaction;
+select instr_name, is_wait, is_wait_file, is_wait_socket, is_stage, is_statement, is_memory, is_transaction;
 select count(name)
 from performance_schema.setup_instruments
 where (name like (concat(instr_name, "%")))
 and (not name like "%/abstract/%")
-into count_expected;
+and (not name like "memory/performance_schema/%")
+into save_count_expected;
+select count(name)
+from performance_schema.setup_instruments
+where (name like (concat(instr_name, "%")))
+and (name like "memory/performance_schema/%")
+into count_builtin_expected;
+select count(name)
+from performance_schema.setup_instruments
+where (name like (concat(instr_name, "%")))
+and (name in (
+"memory/sql/buffered_logs",
+"memory/sql/sql_acl_mem",
+"memory/sql/sql_acl_memex",
+"memory/sql/acl_cache",
+"memory/sql/TABLE_SHARE::mem_root",
+"memory/sql/TABLE",
+"memory/sql/Query_cache",
+"memory/sql/native_functions",
+"memory/sql/Event_basic::mem_root",
+"memory/sql/root",
+"memory/sql/load_env_plugins",
+"memory/sql/plugin_ref",
+"memory/sql/plugin_mem_root",
+"memory/sql/plugin_bookmark",
+"memory/csv/TINA_SHARE",
+"memory/sql/tz_storage",
+"memory/sql/servers_cache",
+"memory/sql/udf_mem"
+    ))
+into count_global_expected;
 set cmd_1= "select count(*) from (select distinct event_name from performance_schema.";
 set cmd_2= concat(" where event_name like \"",
                     instr_name,
@@ -43,8 +88,22 @@ repeat
 fetch pfs_cursor into pfs_table_name;
 if not done then
 select (pfs_table_name like "%waits%") into is_wait_table;
+select (pfs_table_name like "file_summary%") into is_wait_file_table;
+select (pfs_table_name like "socket_summary%") into is_wait_socket_table;
 select (pfs_table_name like "%stages%") into is_stage_table;
 select (pfs_table_name like "%statements%") into is_statement_table;
+select (pfs_table_name like "%memory%") into is_memory_table;
+select (pfs_table_name like "memory_summary_global_by_event_name") into is_memory_global_table;
+select (pfs_table_name like "%transaction%") into is_transaction_table;
+set count_expected = save_count_expected;
+if is_memory_global_table
+then
+set count_expected = save_count_expected + count_builtin_expected;
+end if;
+if is_memory_table = 1 and is_memory_global_table = 0
+then
+set count_expected = save_count_expected - count_global_expected;
+end if;
 select concat("Checking table ", pfs_table_name, " ...") as status;
 select concat(cmd_1, pfs_table_name, cmd_2) into @cmd;
 if debug = 1
@@ -57,37 +116,101 @@ drop prepare stmt;
 set msg_detail= concat("table ", pfs_table_name,
 ", instruments ", count_expected,
 ", found ", @count_actual);
-if is_wait = 1 and is_wait_table = 1 and @count_actual <> count_expected
+if is_wait = 1
+then
+if is_wait_table = 1 and @count_actual <> count_expected
 then
 set msg= concat("Missing wait events: ", msg_detail);
 signal sqlstate '05000' set message_text= msg;
 end if;
-if is_wait = 1 and is_wait_table = 0 and @count_actual <> 0
+if is_wait_table = 0
+and is_wait_file_table = 0
+and is_wait_socket_table = 0
+and @count_actual <> 0
 then
 set msg= concat("Unexpected wait events: ", msg_detail);
 signal sqlstate '05000' set message_text= msg;
 end if;
-if is_stage = 1 and is_stage_table = 1 and @count_actual <> count_expected
+end if;
+if is_wait_file = 1
+then
+if is_wait_file_table = 1 and @count_actual <> count_expected
+then
+set msg= concat("Missing wait/io/file events: ", msg_detail);
+signal sqlstate '05000' set message_text= msg;
+end if;
+if is_wait_table = 0 and is_wait_file_table = 0 and @count_actual <> 0
+then
+set msg= concat("Unexpected wait/io/file events: ", msg_detail);
+signal sqlstate '05000' set message_text= msg;
+end if;
+end if;
+if is_wait_socket = 1
+then
+if is_wait_socket_table = 1 and @count_actual <> count_expected
+then
+set msg= concat("Missing wait/io/socket events: ", msg_detail);
+signal sqlstate '05000' set message_text= msg;
+end if;
+if is_wait_table = 0 and is_wait_socket_table = 0 and @count_actual <> 0
+then
+set msg= concat("Unexpected wait/io/socket events: ", msg_detail);
+signal sqlstate '05000' set message_text= msg;
+end if;
+end if;
+if is_stage = 1
+then
+if is_stage_table = 1 and @count_actual <> count_expected
 then
 set msg= concat("Missing stage events: ", msg_detail);
 signal sqlstate '05000' set message_text= msg;
 end if;
-if is_stage = 1 and is_stage_table = 0 and @count_actual <> 0
+if is_stage_table = 0 and @count_actual <> 0
 then
 set msg= concat("Unexpected stage events: ", msg_detail);
 signal sqlstate '05000' set message_text= msg;
 end if;
-if is_statement = 1 and is_statement_table = 1 and @count_actual <> count_expected
+end if;
+if is_statement = 1
+then
+if is_statement_table = 1 and @count_actual <> count_expected
 then
 set msg= concat("Missing statement events: ", msg_detail);
 signal sqlstate '05000' set message_text= msg;
 end if;
-if is_statement = 1 and is_statement_table = 0 and @count_actual <> 0
+if is_statement_table = 0 and @count_actual <> 0
 then
 set msg= concat("Unexpected statement events: ", msg_detail);
 signal sqlstate '05000' set message_text= msg;
 end if;
 end if;
+if is_memory = 1
+then
+if is_memory_table = 1 and @count_actual <> count_expected
+then
+set msg= concat("Missing memory events: ", msg_detail);
+signal sqlstate '05000' set message_text= msg;
+end if;
+if is_memory_table = 0 and @count_actual <> 0
+then
+set msg= concat("Unexpected memory events: ", msg_detail);
+signal sqlstate '05000' set message_text= msg;
+end if;
+end if;
+if is_transaction = 1
+then
+if is_transaction_table = 1 and @count_actual <> count_expected
+then
+set msg= concat("Missing transaction events: ", msg_detail);
+signal sqlstate '05000' set message_text= msg;
+end if;
+if is_transaction_table = 0 and @count_actual <> 0
+then
+set msg= concat("Unexpected transaction events: ", msg_detail);
+signal sqlstate '05000' set message_text= msg;
+end if;
+end if;
+end if;
 until done
 end repeat;
 close pfs_cursor;
@@ -97,9 +220,9 @@ end
 $
 Warnings:
 Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
+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%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -108,24 +231,35 @@ 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_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
@@ -133,8 +267,8 @@ performance_schema_setup_actors_size	100
 performance_schema_setup_objects_size	100
 performance_schema_users_size	100
 call check_instrument("wait/synch/mutex/");
-instr_name	is_wait	is_stage	is_statement
-wait/synch/mutex/	1	0	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/synch/mutex/	1	0	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -156,6 +290,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -165,11 +309,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("wait/synch/rwlock/");
-instr_name	is_wait	is_stage	is_statement
-wait/synch/rwlock/	1	0	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/synch/rwlock/	1	0	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -191,6 +349,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -200,11 +368,84 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
+Warnings:
+Warning	12000	Done
+call check_instrument("wait/synch/sxlock/");
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/synch/sxlock/	1	0	0	0	0	0	0
+status
+Checking table events_stages_summary_by_account_by_event_name ...
+status
+Checking table events_stages_summary_by_host_by_event_name ...
+status
+Checking table events_stages_summary_by_thread_by_event_name ...
+status
+Checking table events_stages_summary_by_user_by_event_name ...
+status
+Checking table events_stages_summary_global_by_event_name ...
+status
+Checking table events_statements_summary_by_account_by_event_name ...
+status
+Checking table events_statements_summary_by_host_by_event_name ...
+status
+Checking table events_statements_summary_by_thread_by_event_name ...
+status
+Checking table events_statements_summary_by_user_by_event_name ...
+status
+Checking table events_statements_summary_global_by_event_name ...
+status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
+Checking table events_waits_summary_by_account_by_event_name ...
+status
+Checking table events_waits_summary_by_host_by_event_name ...
+status
+Checking table events_waits_summary_by_thread_by_event_name ...
+status
+Checking table events_waits_summary_by_user_by_event_name ...
+status
+Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("wait/synch/cond/");
-instr_name	is_wait	is_stage	is_statement
-wait/synch/cond/	1	0	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/synch/cond/	1	0	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -226,6 +467,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -235,11 +486,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("wait/synch/");
-instr_name	is_wait	is_stage	is_statement
-wait/synch/	1	0	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/synch/	1	0	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -261,6 +526,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -270,11 +545,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("wait/io/file/");
-instr_name	is_wait	is_stage	is_statement
-wait/io/file/	1	0	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/io/file/	1	1	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -296,6 +585,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -305,11 +604,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
-call check_instrument("wait/io/net/");
-instr_name	is_wait	is_stage	is_statement
-wait/io/net/	1	0	0
+call check_instrument("wait/io/socket/");
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/io/socket/	1	0	1	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -331,6 +644,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -340,11 +663,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("wait/io/table/");
-instr_name	is_wait	is_stage	is_statement
-wait/io/table/	1	0	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/io/table/	1	0	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -366,6 +703,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -375,11 +722,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("wait/io/");
-instr_name	is_wait	is_stage	is_statement
-wait/io/	1	0	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/io/	1	0	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -401,6 +762,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -410,11 +781,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("wait/lock/table/");
-instr_name	is_wait	is_stage	is_statement
-wait/lock/table/	1	0	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/lock/table/	1	0	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -436,6 +821,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -445,11 +840,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("wait/lock/");
-instr_name	is_wait	is_stage	is_statement
-wait/lock/	1	0	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/lock/	1	0	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -471,6 +880,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -480,11 +899,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("wait/");
-instr_name	is_wait	is_stage	is_statement
-wait/	1	0	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+wait/	1	0	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -506,6 +939,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -515,11 +958,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("stage/");
-instr_name	is_wait	is_stage	is_statement
-stage/	0	1	0
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+stage/	0	0	0	1	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -541,6 +998,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -550,11 +1017,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("statement/com/");
-instr_name	is_wait	is_stage	is_statement
-statement/com/	0	0	1
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+statement/com/	0	0	0	0	1	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -576,6 +1057,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -585,11 +1076,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("statement/sql/");
-instr_name	is_wait	is_stage	is_statement
-statement/sql/	0	0	1
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+statement/sql/	0	0	0	0	1	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -611,6 +1116,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -620,11 +1135,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("statement/abstract/");
-instr_name	is_wait	is_stage	is_statement
-statement/abstract/	0	0	1
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+statement/abstract/	0	0	0	0	1	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -646,6 +1175,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -655,11 +1194,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 call check_instrument("statement/");
-instr_name	is_wait	is_stage	is_statement
-statement/	0	0	1
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+statement/	0	0	0	0	1	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -681,6 +1234,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -690,11 +1253,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
-call check_instrument("idle/io/socket");
-instr_name	is_wait	is_stage	is_statement
-idle/io/socket	1	0	0
+call check_instrument("idle");
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+idle	1	0	0	0	0	0	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -716,6 +1293,16 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -725,11 +1312,25 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
-call check_instrument("idle/");
-instr_name	is_wait	is_stage	is_statement
-idle/	1	0	0
+call check_instrument("memory/");
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+memory/	0	0	0	0	0	1	0
 status
 Checking table events_stages_summary_by_account_by_event_name ...
 status
@@ -751,6 +1352,75 @@ Checking table events_statements_summary_by_user_by_event_name ...
 status
 Checking table events_statements_summary_global_by_event_name ...
 status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
+Checking table events_waits_summary_by_account_by_event_name ...
+status
+Checking table events_waits_summary_by_host_by_event_name ...
+status
+Checking table events_waits_summary_by_thread_by_event_name ...
+status
+Checking table events_waits_summary_by_user_by_event_name ...
+status
+Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
+Warnings:
+Warning	12000	Done
+call check_instrument("memory/performance_schema/");
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+memory/performance_schema/	0	0	0	0	0	1	0
+status
+Checking table events_stages_summary_by_account_by_event_name ...
+status
+Checking table events_stages_summary_by_host_by_event_name ...
+status
+Checking table events_stages_summary_by_thread_by_event_name ...
+status
+Checking table events_stages_summary_by_user_by_event_name ...
+status
+Checking table events_stages_summary_global_by_event_name ...
+status
+Checking table events_statements_summary_by_account_by_event_name ...
+status
+Checking table events_statements_summary_by_host_by_event_name ...
+status
+Checking table events_statements_summary_by_thread_by_event_name ...
+status
+Checking table events_statements_summary_by_user_by_event_name ...
+status
+Checking table events_statements_summary_global_by_event_name ...
+status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
 Checking table events_waits_summary_by_account_by_event_name ...
 status
 Checking table events_waits_summary_by_host_by_event_name ...
@@ -760,6 +1430,79 @@ status
 Checking table events_waits_summary_by_user_by_event_name ...
 status
 Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
+Warnings:
+Warning	12000	Done
+call check_instrument("transaction");
+instr_name	is_wait	is_wait_file	is_wait_socket	is_stage	is_statement	is_memory	is_transaction
+transaction	0	0	0	0	0	0	1
+status
+Checking table events_stages_summary_by_account_by_event_name ...
+status
+Checking table events_stages_summary_by_host_by_event_name ...
+status
+Checking table events_stages_summary_by_thread_by_event_name ...
+status
+Checking table events_stages_summary_by_user_by_event_name ...
+status
+Checking table events_stages_summary_global_by_event_name ...
+status
+Checking table events_statements_summary_by_account_by_event_name ...
+status
+Checking table events_statements_summary_by_host_by_event_name ...
+status
+Checking table events_statements_summary_by_thread_by_event_name ...
+status
+Checking table events_statements_summary_by_user_by_event_name ...
+status
+Checking table events_statements_summary_global_by_event_name ...
+status
+Checking table events_transactions_summary_by_account_by_event_name ...
+status
+Checking table events_transactions_summary_by_host_by_event_name ...
+status
+Checking table events_transactions_summary_by_thread_by_event_name ...
+status
+Checking table events_transactions_summary_by_user_by_event_name ...
+status
+Checking table events_transactions_summary_global_by_event_name ...
+status
+Checking table events_waits_summary_by_account_by_event_name ...
+status
+Checking table events_waits_summary_by_host_by_event_name ...
+status
+Checking table events_waits_summary_by_thread_by_event_name ...
+status
+Checking table events_waits_summary_by_user_by_event_name ...
+status
+Checking table events_waits_summary_global_by_event_name ...
+status
+Checking table file_summary_by_event_name ...
+status
+Checking table memory_summary_by_account_by_event_name ...
+status
+Checking table memory_summary_by_host_by_event_name ...
+status
+Checking table memory_summary_by_thread_by_event_name ...
+status
+Checking table memory_summary_by_user_by_event_name ...
+status
+Checking table memory_summary_global_by_event_name ...
+status
+Checking table socket_summary_by_event_name ...
 Warnings:
 Warning	12000	Done
 drop procedure check_instrument;
diff --git a/mysql-test/suite/perfschema/r/part_table_io.result b/mysql-test/suite/perfschema/r/part_table_io.result
index 4f2bd7169d7..48b7c891693 100644
--- a/mysql-test/suite/perfschema/r/part_table_io.result
+++ b/mysql-test/suite/perfschema/r/part_table_io.result
@@ -73,62 +73,68 @@ 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
-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		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_%';
 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
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/prepared_statements.result b/mysql-test/suite/perfschema/r/prepared_statements.result
new file mode 100644
index 00000000000..c11b486094e
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/prepared_statements.result
@@ -0,0 +1,672 @@
+CREATE DATABASE db;
+USE db;
+TRUNCATE TABLE performance_schema.prepared_statements_instances ;
+TRUNCATE TABLE performance_schema.events_statements_history_long  ;
+CREATE TABLE t1 (a INT NOT NULL);
+INSERT INTO t1 VALUES (4), (8), (11), (32), (80);
+PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse';
+SET @table = 't1';
+SET @s = CONCAT('SELECT * FROM ', @table);
+PREPARE st2 FROM @s;
+PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?';
+PREPARE st4 FROM
+'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a';
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st1
+SQL_TEXT	SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+STATEMENT_NAME	st2
+SQL_TEXT	SELECT * FROM t1
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+STATEMENT_NAME	st3
+SQL_TEXT	INSERT INTO t1 SELECT * FROM t1 WHERE a<=?
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+STATEMENT_NAME	st4
+SQL_TEXT	(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' ;
+EVENT_NAME	statement/sql/truncate
+SQL_TEXT	TRUNCATE TABLE performance_schema.events_statements_history_long
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/create_table
+SQL_TEXT	CREATE TABLE t1 (a INT NOT NULL)
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/insert
+SQL_TEXT	INSERT INTO t1 VALUES (4), (8), (11), (32), (80)
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/prepare_sql
+SQL_TEXT	PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @table = 't1'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @s = CONCAT('SELECT * FROM ', @table)
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/prepare_sql
+SQL_TEXT	PREPARE st2 FROM @s
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/prepare_sql
+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
+'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/select
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+SET @a = 3;
+SET @b = 4;
+EXECUTE st1 USING @a, @b;
+hypotenuse
+5
+EXECUTE st2;
+a
+4
+8
+11
+32
+80
+SET @c=3;
+EXECUTE st3 using @c;
+EXECUTE st4;
+a
+4
+8
+11
+14
+18
+21
+32
+42
+80
+90
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st1
+SQL_TEXT	SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse
+COUNT_REPREPARE	0
+COUNT_EXECUTE	1
+SUM_ROWS_SENT	1
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+STATEMENT_NAME	st2
+SQL_TEXT	SELECT * FROM t1
+COUNT_REPREPARE	0
+COUNT_EXECUTE	1
+SUM_ROWS_SENT	5
+SUM_SELECT_SCAN	1
+SUM_NO_INDEX_USED	1
+STATEMENT_NAME	st3
+SQL_TEXT	INSERT INTO t1 SELECT * FROM t1 WHERE a<=?
+COUNT_REPREPARE	0
+COUNT_EXECUTE	1
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	1
+SUM_NO_INDEX_USED	1
+STATEMENT_NAME	st4
+SQL_TEXT	(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a
+COUNT_REPREPARE	0
+COUNT_EXECUTE	1
+SUM_ROWS_SENT	10
+SUM_SELECT_SCAN	3
+SUM_NO_INDEX_USED	1
+SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' ;
+EVENT_NAME	statement/sql/truncate
+SQL_TEXT	TRUNCATE TABLE performance_schema.events_statements_history_long
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/create_table
+SQL_TEXT	CREATE TABLE t1 (a INT NOT NULL)
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/insert
+SQL_TEXT	INSERT INTO t1 VALUES (4), (8), (11), (32), (80)
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/prepare_sql
+SQL_TEXT	PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @table = 't1'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @s = CONCAT('SELECT * FROM ', @table)
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/prepare_sql
+SQL_TEXT	PREPARE st2 FROM @s
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/prepare_sql
+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
+'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/select
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/select
+SQL_TEXT	SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @a = 3
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @b = 4
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/execute_sql
+SQL_TEXT	EXECUTE st1 USING @a, @b
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/execute_sql
+SQL_TEXT	EXECUTE st2
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @c=3
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/execute_sql
+SQL_TEXT	EXECUTE st3 using @c
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/execute_sql
+SQL_TEXT	EXECUTE st4
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/select
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+TRUNCATE TABLE performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st1
+SQL_TEXT	SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+STATEMENT_NAME	st2
+SQL_TEXT	SELECT * FROM t1
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+STATEMENT_NAME	st3
+SQL_TEXT	INSERT INTO t1 SELECT * FROM t1 WHERE a<=?
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+STATEMENT_NAME	st4
+SQL_TEXT	(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+DEALLOCATE PREPARE st1;
+DEALLOCATE PREPARE st2;
+DEALLOCATE PREPARE st3;
+DEALLOCATE PREPARE st4;
+DROP TABLE t1;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' ;
+EVENT_NAME	statement/sql/truncate
+SQL_TEXT	TRUNCATE TABLE performance_schema.events_statements_history_long
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/create_table
+SQL_TEXT	CREATE TABLE t1 (a INT NOT NULL)
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/insert
+SQL_TEXT	INSERT INTO t1 VALUES (4), (8), (11), (32), (80)
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/prepare_sql
+SQL_TEXT	PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @table = 't1'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @s = CONCAT('SELECT * FROM ', @table)
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/prepare_sql
+SQL_TEXT	PREPARE st2 FROM @s
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/prepare_sql
+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
+'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/select
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/select
+SQL_TEXT	SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @a = 3
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @b = 4
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/execute_sql
+SQL_TEXT	EXECUTE st1 USING @a, @b
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/execute_sql
+SQL_TEXT	EXECUTE st2
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/set_option
+SQL_TEXT	SET @c=3
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/execute_sql
+SQL_TEXT	EXECUTE st3 using @c
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/execute_sql
+SQL_TEXT	EXECUTE st4
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/select
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/select
+SQL_TEXT	SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db'
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/truncate
+SQL_TEXT	TRUNCATE TABLE performance_schema.prepared_statements_instances
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/select
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/dealloc_sql
+SQL_TEXT	DEALLOCATE PREPARE st1
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/dealloc_sql
+SQL_TEXT	DEALLOCATE PREPARE st2
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/dealloc_sql
+SQL_TEXT	DEALLOCATE PREPARE st3
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/dealloc_sql
+SQL_TEXT	DEALLOCATE PREPARE st4
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/drop_table
+SQL_TEXT	DROP TABLE t1
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+EVENT_NAME	statement/sql/select
+SQL_TEXT	SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+TRUNCATE TABLE performance_schema.events_statements_history_long ;
+UPDATE performance_schema.setup_consumers SET ENABLED = 'NO';
+CREATE TABLE t1 (a INT NOT NULL);
+INSERT INTO t1 VALUES (4), (8), (11), (32), (80);
+PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse';
+SET @table = 't1';
+SET @s = CONCAT('SELECT * FROM ', @table);
+PREPARE st2 FROM @s;
+PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?';
+PREPARE st4 FROM
+'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a';
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' ;
+EVENT_NAME	statement/sql/truncate
+SQL_TEXT	TRUNCATE TABLE performance_schema.events_statements_history_long
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+SET @a = 3;
+SET @b = 4;
+EXECUTE st1 USING @a, @b;
+hypotenuse
+5
+EXECUTE st2;
+a
+4
+8
+11
+32
+80
+SET @c=3;
+EXECUTE st3 using @c;
+EXECUTE st4;
+a
+4
+8
+11
+14
+18
+21
+32
+42
+80
+90
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' ;
+EVENT_NAME	statement/sql/truncate
+SQL_TEXT	TRUNCATE TABLE performance_schema.events_statements_history_long
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+DEALLOCATE PREPARE st1;
+DEALLOCATE PREPARE st2;
+DEALLOCATE PREPARE st3;
+DEALLOCATE PREPARE st4;
+DROP TABLE t1;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' ;
+EVENT_NAME	statement/sql/truncate
+SQL_TEXT	TRUNCATE TABLE performance_schema.events_statements_history_long
+OBJECT_TYPE	NULL
+OBJECT_SCHEMA	NULL
+OBJECT_NAME	NULL
+TRUNCATE TABLE performance_schema.events_statements_history_long ;
+UPDATE performance_schema.setup_consumers SET ENABLED = 'YES';
+PREPARE st FROM 'SELECT SUM(1000 + ?) AS total';
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT SUM(1000 + ?) AS total
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+SET @d=100;
+EXECUTE st USING @d;
+total
+1100
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT SUM(1000 + ?) AS total
+COUNT_REPREPARE	0
+COUNT_EXECUTE	1
+SUM_ROWS_SENT	1
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+SET @d = @d + 100;
+EXECUTE st USING @d;
+total
+1200
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT SUM(1000 + ?) AS total
+COUNT_REPREPARE	0
+COUNT_EXECUTE	2
+SUM_ROWS_SENT	2
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+SET @d = @d + 100;
+EXECUTE st USING @d;
+total
+1300
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT SUM(1000 + ?) AS total
+COUNT_REPREPARE	0
+COUNT_EXECUTE	3
+SUM_ROWS_SENT	3
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+SET @d = @d + 100;
+EXECUTE st USING @d;
+total
+1400
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT SUM(1000 + ?) AS total
+COUNT_REPREPARE	0
+COUNT_EXECUTE	4
+SUM_ROWS_SENT	4
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+SET @d = @d + 100;
+EXECUTE st USING @d;
+total
+1500
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT SUM(1000 + ?) AS total
+COUNT_REPREPARE	0
+COUNT_EXECUTE	5
+SUM_ROWS_SENT	5
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+SET @d = @d + 100;
+EXECUTE st USING @d;
+total
+1600
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT SUM(1000 + ?) AS total
+COUNT_REPREPARE	0
+COUNT_EXECUTE	6
+SUM_ROWS_SENT	6
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+TRUNCATE TABLE performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT SUM(1000 + ?) AS total
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+UPDATE performance_schema.setup_instruments SET ENABLED = 'NO' 
+WHERE NAME like "statement/sql/execute%";
+SET @d=3274;
+EXECUTE st USING @d;
+total
+4274
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT SUM(1000 + ?) AS total
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+UPDATE performance_schema.setup_instruments SET ENABLED = 'NO'
+       WHERE NAME like "statement/sql/prepare%";
+DEALLOCATE PREPARE st;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+UPDATE performance_schema.setup_instruments SET ENABLED = 'YES'
+       WHERE NAME like "statement/sql/prepare%";
+UPDATE performance_schema.setup_instruments SET ENABLED = 'YES' 
+WHERE NAME like "statement/sql/execute%";
+CREATE TABLE tab(
+Id   INT,
+name CHAR(10),
+age  INT
+);
+INSERT INTO tab VALUES(1,"Nakshatr",25),(2,"chanda",24),(3,"tejas",78);
+PREPARE st FROM 'SELECT * FROM tab';
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT * FROM tab
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+EXECUTE st;
+Id	name	age
+1	Nakshatr	25
+2	chanda	24
+3	tejas	78
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT * FROM tab
+COUNT_REPREPARE	0
+COUNT_EXECUTE	1
+SUM_ROWS_SENT	3
+SUM_SELECT_SCAN	1
+SUM_NO_INDEX_USED	1
+ALTER TABLE tab DROP COLUMN age;
+EXECUTE st;
+Id	name
+1	Nakshatr
+2	chanda
+3	tejas
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT * FROM tab
+COUNT_REPREPARE	1
+COUNT_EXECUTE	2
+SUM_ROWS_SENT	6
+SUM_SELECT_SCAN	2
+SUM_NO_INDEX_USED	2
+ALTER TABLE tab ADD COLUMN age INT NULL;
+EXECUTE st;
+Id	name	age
+1	Nakshatr	NULL
+2	chanda	NULL
+3	tejas	NULL
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT * FROM tab
+COUNT_REPREPARE	2
+COUNT_EXECUTE	3
+SUM_ROWS_SENT	9
+SUM_SELECT_SCAN	3
+SUM_NO_INDEX_USED	3
+TRUNCATE TABLE performance_schema.prepared_statements_instances ;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+STATEMENT_NAME	st
+SQL_TEXT	SELECT * FROM tab
+COUNT_REPREPARE	0
+COUNT_EXECUTE	0
+SUM_ROWS_SENT	0
+SUM_SELECT_SCAN	0
+SUM_NO_INDEX_USED	0
+DEALLOCATE PREPARE st;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_REPREPARE, COUNT_EXECUTE, SUM_ROWS_SENT, SUM_SELECT_SCAN, SUM_NO_INDEX_USED FROM performance_schema.prepared_statements_instances ;
+TRUNCATE TABLE performance_schema.prepared_statements_instances  ;
+TRUNCATE TABLE performance_schema.events_statements_history_long ;
+DROP TABLE tab;
+DROP DATABASE db;
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
new file mode 100644
index 00000000000..318c4a1d21b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/prepared_stmts_by_stored_programs.result
@@ -0,0 +1,126 @@
+TRUNCATE TABLE performance_schema.prepared_statements_instances;
+CREATE DATABASE db;
+USE db;
+CREATE TABLE t
+(
+a INT,
+b CHAR(10),
+name CHAR(10)
+);
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
+INSERT INTO t VALUES (1,"kuchipudi","Vempati");
+INSERT INTO t VALUES (2,"odissi","Mohapatra");
+INSERT INTO t VALUES (3,"kathak","Maharaj");
+INSERT INTO t VALUES (4,"mohiyattam","Kalyanikutty");
+Warnings:
+Warning	1265	Data truncated for column 'name' at row 1
+INSERT INTO t VALUES (5,"manipuri","Guru");
+INSERT INTO t VALUES (6,"kathakali","Manavedan");
+SET sql_mode= default;
+CREATE PROCEDURE p1()
+BEGIN
+PREPARE st FROM 'SELECT * FROM t WHERE a<=?' ;
+SET @a=3;
+EXECUTE st using @a;
+END|
+CALL p1()|
+a	b	name
+1	kuchipudi	Vempati
+2	odissi	Mohapatra
+3	kathak	Maharaj
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+st	SELECT * FROM t WHERE a<=?	1	0	PROCEDURE	db	p1
+DEALLOCATE PREPARE st|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+CREATE PROCEDURE p2()
+BEGIN
+PREPARE st1 FROM 'INSERT INTO t SELECT * FROM t WHERE a<=?' ;
+END|
+CALL p2()|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+st1	INSERT INTO t SELECT * FROM t WHERE a<=?	0	0	PROCEDURE	db	p2
+SET @a=4|
+EXECUTE st1 using @a|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+st1	INSERT INTO t SELECT * FROM t WHERE a<=?	1	0	PROCEDURE	db	p2
+CREATE PROCEDURE p3()
+BEGIN
+SET @a=2; 
+EXECUTE st1 using @a;
+END|
+CALL p3()|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+st1	INSERT INTO t SELECT * FROM t WHERE a<=?	2	0	PROCEDURE	db	p2
+DEALLOCATE PREPARE st1|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+PREPARE st2 FROM 'UPDATE t SET a=a+1 WHERE b=?'|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+st2	UPDATE t SET a=a+1 WHERE b=?	0	0	NULL	NULL	NULL
+CREATE PROCEDURE p4()
+BEGIN
+SET @b='kuchipudi';
+EXECUTE st2 USING @b;
+END|
+CALL p4()|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+st2	UPDATE t SET a=a+1 WHERE b=?	1	0	NULL	NULL	NULL
+ALTER TABLE t DROP COLUMN name;
+# COUNT_REPREPARE must be 1 
+CALL p4()|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+st2	UPDATE t SET a=a+1 WHERE b=?	2	1	NULL	NULL	NULL
+DEALLOCATE PREPARE st2|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+CREATE PROCEDURE p5()
+BEGIN
+SET @a=1;
+SELECT @a;
+END|
+PREPARE st3 FROM 'CALL p5()'|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+st3	CALL p5()	0	0	NULL	NULL	NULL
+EXECUTE st3|
+@a
+1
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+st3	CALL p5()	1	0	NULL	NULL	NULL
+DEALLOCATE PREPARE st3|
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances|
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+CREATE TABLE tab(a INT);
+SET GLOBAL event_scheduler=ON;
+CREATE EVENT e1 ON SCHEDULE EVERY 10 HOUR DO
+BEGIN
+PREPARE st FROM 'INSERT INTO tab VALUES(?)';  
+SET @a=1;
+EXECUTE st USING @a;
+END|
+SELECT * FROM tab LIMIT 1;
+a
+1
+SET GLOBAL event_scheduler=OFF;
+SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances;
+STATEMENT_NAME	SQL_TEXT	COUNT_EXECUTE	COUNT_REPREPARE	OWNER_OBJECT_TYPE	OWNER_OBJECT_SCHEMA	OWNER_OBJECT_NAME
+TRUNCATE TABLE performance_schema.prepared_statements_instances;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+DROP TABLE t;
+DROP TABLE tab;
+DROP PROCEDURE p1;
+DROP PROCEDURE p2;
+DROP PROCEDURE p3;
+DROP PROCEDURE p4;
+DROP PROCEDURE p5;
+DROP EVENT IF EXISTS e1;
+DROP DATABASE db;
diff --git a/mysql-test/suite/perfschema/r/privilege.result b/mysql-test/suite/perfschema/r/privilege.result
index 0a038000536..c5e0ebf3c92 100644
--- a/mysql-test/suite/perfschema/r/privilege.result
+++ b/mysql-test/suite/perfschema/r/privilege.result
@@ -581,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;
@@ -593,5 +595,19 @@ 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";
+Warnings:
+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
+#
+CREATE USER 'user_name_len_22_01234'@localhost;
+GRANT ALL ON performance_schema.* TO 'user_name_len_22_01234'@localhost with GRANT OPTION;
+ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
+REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'user_name_len_22_01234'@localhost;
+DROP USER 'user_name_len_22_01234'@localhost;
diff --git a/mysql-test/suite/perfschema/r/privilege_table_io.result b/mysql-test/suite/perfschema/r/privilege_table_io.result
index 00f382de966..77f2b4a6887 100644
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result
@@ -24,9 +24,7 @@ flush privileges;
 insert into test.marker set a = 1;
 insert into test.marker set a = 1;
 insert into test.marker set a = 1;
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
+show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	100
@@ -35,31 +33,42 @@ 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_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 status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -69,9 +78,15 @@ 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
@@ -81,6 +96,7 @@ 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
@@ -96,42 +112,56 @@ where event_name like 'wait/io/table/%'
   and object_schema in ("test", "mysql")
 order by thread_id, event_id;
 event_name	short_source	object_type	object_schema	pretty_name	operation	number_of_bytes
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	global_priv	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	NULL
-wait/io/table/sql/handler	handler.cc:	TABLE	mysql	db	fetch	NULL
-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
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
+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_%';
 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
 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 ae64c90582c..a84fff60431 100644
--- a/mysql-test/suite/perfschema/r/query_cache.result
+++ b/mysql-test/suite/perfschema/r/query_cache.result
@@ -11,13 +11,13 @@ a
 1
 2
 3
-show status like "Qcache_queries_in_cache";
+show global status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	1
-show status like "Qcache_inserts";
+show global status like "Qcache_inserts";
 Variable_name	Value
 Qcache_inserts	1
-show status like "Qcache_hits";
+show global status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	0
 select * from t1;
@@ -25,13 +25,13 @@ a
 1
 2
 3
-show status like "Qcache_queries_in_cache";
+show global status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	1
-show status like "Qcache_inserts";
+show global status like "Qcache_inserts";
 Variable_name	Value
 Qcache_inserts	1
-show status like "Qcache_hits";
+show global status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	1
 select spins from performance_schema.events_waits_current order by event_name limit 1;
@@ -40,13 +40,15 @@ NULL
 select * from performance_schema.setup_timers where name='wait';
 NAME	TIMER_NAME
 wait	{CYCLE_OR_NANOSECOND}
-show status like "Qcache_queries_in_cache";
+Warnings:
+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
-show status like "Qcache_inserts";
+show global status like "Qcache_inserts";
 Variable_name	Value
 Qcache_inserts	1
-show status like "Qcache_hits";
+show global status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	1
 select spins from performance_schema.events_waits_current order by event_name limit 1;
@@ -55,13 +57,15 @@ NULL
 select * from performance_schema.setup_timers where name='wait';
 NAME	TIMER_NAME
 wait	{CYCLE_OR_NANOSECOND}
-show status like "Qcache_queries_in_cache";
+Warnings:
+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
-show status like "Qcache_inserts";
+show global status like "Qcache_inserts";
 Variable_name	Value
 Qcache_inserts	1
-show status like "Qcache_hits";
+show global status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	1
 SET GLOBAL query_cache_size=@save_query_cache_size;
diff --git a/mysql-test/suite/perfschema/r/read_only.result b/mysql-test/suite/perfschema/r/read_only.result
index 32e3a724b5e..344526bbd63 100644
--- a/mysql-test/suite/perfschema/r/read_only.result
+++ b/mysql-test/suite/perfschema/r/read_only.result
@@ -14,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';
@@ -31,7 +32,7 @@ select * from performance_schema.setup_instruments;
 update performance_schema.setup_instruments set enabled='NO';
 update performance_schema.setup_instruments set enabled='YES';
 connection default;
-grant super on *.* to pfsuser@localhost;
+grant READ_ONLY ADMIN on *.* to pfsuser@localhost;
 flush privileges;
 disconnect con1;
 connect  con1, localhost, pfsuser, , test;
@@ -40,7 +41,7 @@ select @@global.read_only;
 1
 show grants;
 Grants for pfsuser@localhost
-GRANT SUPER ON *.* TO `pfsuser`@`localhost`
+GRANT READ_ONLY ADMIN ON *.* TO `pfsuser`@`localhost`
 GRANT SELECT, UPDATE ON `performance_schema`.* TO `pfsuser`@`localhost`
 select * from performance_schema.setup_instruments;
 update performance_schema.setup_instruments set enabled='NO';
diff --git a/mysql-test/suite/perfschema/r/relaylog.result b/mysql-test/suite/perfschema/r/relaylog.result
index 3fcf7367b53..ce3e9c04a5e 100644
--- a/mysql-test/suite/perfschema/r/relaylog.result
+++ b/mysql-test/suite/perfschema/r/relaylog.result
@@ -50,7 +50,9 @@ 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
+wait/io/file/sql/binlog_cache	NONE	NONE	NONE	NONE
 wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
+wait/io/file/sql/binlog_index_cache	NONE	NONE	NONE	NONE
 wait/io/file/sql/binlog_state	NONE	NONE	NONE	NONE
 select
 EVENT_NAME,
@@ -77,7 +79,9 @@ select * from performance_schema.file_summary_by_event_name
 where event_name like "%relaylog%" order by event_name;
 EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
 wait/io/file/sql/relaylog	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+wait/io/file/sql/relaylog_cache	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 wait/io/file/sql/relaylog_index	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+wait/io/file/sql/relaylog_index_cache	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 select * from performance_schema.events_waits_summary_global_by_event_name
 where event_name like "%MYSQL_RELAY_LOG%"
   and event_name not like "%MYSQL_RELAY_LOG::update_cond"
@@ -135,7 +139,9 @@ 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
+wait/io/file/sql/binlog_cache	NONE	NONE	NONE	NONE
 wait/io/file/sql/binlog_index	MANY	MANY	MANY	MANY
+wait/io/file/sql/binlog_index_cache	NONE	NONE	NONE	NONE
 wait/io/file/sql/binlog_state	NONE	NONE	NONE	NONE
 select
 EVENT_NAME,
@@ -182,7 +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
+wait/io/file/sql/relaylog_cache	NONE	NONE	NONE	NONE
 wait/io/file/sql/relaylog_index	MANY	MANY	MANY	MANY
+wait/io/file/sql/relaylog_index_cache	NONE	NONE	NONE	NONE
 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 a9cc5b1da39..a7946da7eab 100644
--- a/mysql-test/suite/perfschema/r/rollback_table_io.result
+++ b/mysql-test/suite/perfschema/r/rollback_table_io.result
@@ -42,34 +42,48 @@ 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
-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		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_%';
 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
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/rpl_group_member_stats.result b/mysql-test/suite/perfschema/r/rpl_group_member_stats.result
new file mode 100644
index 00000000000..fd36a774307
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/rpl_group_member_stats.result
@@ -0,0 +1,8 @@
+include/assert.inc [The value of member_id should not be present]
+include/assert.inc [The value of view_id should not be present]
+include/assert.inc [The value of Count_Transactions_in_queue should be 0]
+include/assert.inc [The value of Count_Transactions_checked should be 0]
+include/assert.inc [The value of Count_conflicts_detected should be 0]
+include/assert.inc [The value of Count_Transactions_rows_validating should be 0]
+include/assert.inc [The value of Transactions_Committed_all_members should be 0]
+include/assert.inc [The value of Last_conflict_free_transaction should not be present]
diff --git a/mysql-test/suite/perfschema/r/rpl_group_members.result b/mysql-test/suite/perfschema/r/rpl_group_members.result
new file mode 100644
index 00000000000..2715a0d9f23
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/rpl_group_members.result
@@ -0,0 +1,5 @@
+include/assert.inc [The value of channel name should be empty]
+include/assert.inc [The value of member_id should be empty]
+include/assert.inc [The value of member_host should be empty]
+include/assert.inc [The value of member_port should be empty]
+include/assert.inc [The value of member_state should be empty]
diff --git a/mysql-test/suite/perfschema/r/rpl_gtid_func.result b/mysql-test/suite/perfschema/r/rpl_gtid_func.result
index b07c29a054c..de4b1ea18ca 100644
--- a/mysql-test/suite/perfschema/r/rpl_gtid_func.result
+++ b/mysql-test/suite/perfschema/r/rpl_gtid_func.result
@@ -18,7 +18,7 @@ update performance_schema.setup_instruments
 set enabled='YES', timed='NO';
 connection master;
 select * from performance_schema.setup_instruments
-where timed='NO';
+where timed='NO' and name not like "memory/%";
 NAME	ENABLED	TIMED
 select "This better be in the master" as in_master_digest;
 in_master_digest
@@ -28,11 +28,27 @@ values ('TABLE', 'master', 'foo', 'YES', 'YES');
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+EVENT	%	%	YES	YES
+EVENT	information_schema	%	NO	NO
+EVENT	mysql	%	NO	NO
+EVENT	performance_schema	%	NO	NO
+FUNCTION	%	%	YES	YES
+FUNCTION	information_schema	%	NO	NO
+FUNCTION	mysql	%	NO	NO
+FUNCTION	performance_schema	%	NO	NO
+PROCEDURE	%	%	YES	YES
+PROCEDURE	information_schema	%	NO	NO
+PROCEDURE	mysql	%	NO	NO
+PROCEDURE	performance_schema	%	NO	NO
 TABLE	%	%	YES	YES
 TABLE	information_schema	%	NO	NO
 TABLE	master	foo	YES	YES
 TABLE	mysql	%	NO	NO
 TABLE	performance_schema	%	NO	NO
+TRIGGER	%	%	YES	YES
+TRIGGER	information_schema	%	NO	NO
+TRIGGER	mysql	%	NO	NO
+TRIGGER	performance_schema	%	NO	NO
 select digest_text, count_star
 from performance_schema.events_statements_summary_by_digest
 where digest_text like "%in_%_digest%";
@@ -55,11 +71,27 @@ values ('TABLE', 'slave', 'foo', 'YES', 'YES');
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+EVENT	%	%	YES	YES
+EVENT	information_schema	%	NO	NO
+EVENT	mysql	%	NO	NO
+EVENT	performance_schema	%	NO	NO
+FUNCTION	%	%	YES	YES
+FUNCTION	information_schema	%	NO	NO
+FUNCTION	mysql	%	NO	NO
+FUNCTION	performance_schema	%	NO	NO
+PROCEDURE	%	%	YES	YES
+PROCEDURE	information_schema	%	NO	NO
+PROCEDURE	mysql	%	NO	NO
+PROCEDURE	performance_schema	%	NO	NO
 TABLE	%	%	YES	YES
 TABLE	information_schema	%	NO	NO
 TABLE	mysql	%	NO	NO
 TABLE	performance_schema	%	NO	NO
 TABLE	slave	foo	YES	YES
+TRIGGER	%	%	YES	YES
+TRIGGER	information_schema	%	NO	NO
+TRIGGER	mysql	%	NO	NO
+TRIGGER	performance_schema	%	NO	NO
 select digest_text, count_star
 from performance_schema.events_statements_summary_by_digest
 where digest_text like "%in_%_digest%";
@@ -73,8 +105,24 @@ delete from performance_schema.setup_objects
 where object_schema='slave';
 select * from performance_schema.setup_objects;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+EVENT	mysql	%	NO	NO
+EVENT	performance_schema	%	NO	NO
+EVENT	information_schema	%	NO	NO
+EVENT	%	%	YES	YES
+FUNCTION	mysql	%	NO	NO
+FUNCTION	performance_schema	%	NO	NO
+FUNCTION	information_schema	%	NO	NO
+FUNCTION	%	%	YES	YES
+PROCEDURE	mysql	%	NO	NO
+PROCEDURE	performance_schema	%	NO	NO
+PROCEDURE	information_schema	%	NO	NO
+PROCEDURE	%	%	YES	YES
 TABLE	mysql	%	NO	NO
 TABLE	performance_schema	%	NO	NO
 TABLE	information_schema	%	NO	NO
 TABLE	%	%	YES	YES
+TRIGGER	mysql	%	NO	NO
+TRIGGER	performance_schema	%	NO	NO
+TRIGGER	information_schema	%	NO	NO
+TRIGGER	%	%	YES	YES
 include/rpl_end.inc
diff --git a/mysql-test/suite/perfschema/r/rpl_statements.result b/mysql-test/suite/perfschema/r/rpl_statements.result
index 431b8445309..d72402bf691 100644
--- a/mysql-test/suite/perfschema/r/rpl_statements.result
+++ b/mysql-test/suite/perfschema/r/rpl_statements.result
@@ -8,7 +8,7 @@ connection master;
 
 *** Create test tables
 
-show variables like 'binlog_format%';
+show global variables like 'binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
 drop table if exists test.marker;
@@ -44,7 +44,7 @@ Expect 1
 #
 connection master;
 
-show variables like 'binlog_format%';
+show global variables like 'binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
 *** Clear statement events
@@ -214,7 +214,7 @@ s1	s2
 
 select * from performance_schema.events_statements_history_long
 where thread_id = @slave_thread_id;
-THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	DIGEST	DIGEST_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	DIGEST	DIGEST_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
 
 #
 # STEP 9 - CLEAN UP
diff --git a/mysql-test/suite/perfschema/r/rpl_threads.result b/mysql-test/suite/perfschema/r/rpl_threads.result
new file mode 100644
index 00000000000..c756b4d9046
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/rpl_threads.result
@@ -0,0 +1,61 @@
+include/master-slave.inc
+[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;
+COMMAND	STATE
+Binlog Dump	Master has sent all binlog to slave; waiting for more updates
+select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
+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
+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
+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
+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
+include/rpl_end.inc
diff --git a/mysql-test/suite/perfschema/r/schema.result b/mysql-test/suite/perfschema/r/schema.result
index 1f331394df6..f92548d5876 100644
--- a/mysql-test/suite/perfschema/r/schema.result
+++ b/mysql-test/suite/perfschema/r/schema.result
@@ -23,9 +23,18 @@ 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_program
 events_statements_summary_by_thread_by_event_name
 events_statements_summary_by_user_by_event_name
 events_statements_summary_global_by_event_name
+events_transactions_current
+events_transactions_history
+events_transactions_history_long
+events_transactions_summary_by_account_by_event_name
+events_transactions_summary_by_host_by_event_name
+events_transactions_summary_by_thread_by_event_name
+events_transactions_summary_by_user_by_event_name
+events_transactions_summary_global_by_event_name
 events_waits_current
 events_waits_history
 events_waits_history_long
@@ -38,14 +47,27 @@ events_waits_summary_global_by_event_name
 file_instances
 file_summary_by_event_name
 file_summary_by_instance
+global_status
 host_cache
 hosts
+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
 mutex_instances
 objects_summary_global_by_type
 performance_timers
+prepared_statements_instances
+replication_applier_configuration
+replication_applier_status
+replication_applier_status_by_coordinator
+replication_connection_configuration
 rwlock_instances
 session_account_connect_attrs
 session_connect_attrs
+session_status
 setup_actors
 setup_consumers
 setup_instruments
@@ -54,15 +76,21 @@ setup_timers
 socket_instances
 socket_summary_by_event_name
 socket_summary_by_instance
+status_by_account
+status_by_host
+status_by_thread
+status_by_user
+table_handles
 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
 show create table accounts;
 Table	Create Table
 accounts	CREATE TABLE `accounts` (
-  `USER` char(16) 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
@@ -84,8 +112,10 @@ events_stages_current	CREATE TABLE `events_stages_current` (
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
   `TIMER_END` bigint(20) unsigned DEFAULT NULL,
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
+  `WORK_COMPLETED` bigint(20) unsigned DEFAULT NULL,
+  `WORK_ESTIMATED` bigint(20) unsigned DEFAULT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_stages_history;
 Table	Create Table
@@ -98,8 +128,10 @@ events_stages_history	CREATE TABLE `events_stages_history` (
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
   `TIMER_END` bigint(20) unsigned DEFAULT NULL,
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
+  `WORK_COMPLETED` bigint(20) unsigned DEFAULT NULL,
+  `WORK_ESTIMATED` bigint(20) unsigned DEFAULT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_stages_history_long;
 Table	Create Table
@@ -112,8 +144,10 @@ events_stages_history_long	CREATE TABLE `events_stages_history_long` (
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
   `TIMER_END` bigint(20) unsigned DEFAULT NULL,
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
+  `WORK_COMPLETED` bigint(20) unsigned DEFAULT NULL,
+  `WORK_ESTIMATED` bigint(20) unsigned DEFAULT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_stages_summary_by_host_by_event_name;
 Table	Create Table
@@ -140,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(16) 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,
@@ -151,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(16) 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,
@@ -212,7 +246,8 @@ events_statements_current	CREATE TABLE `events_statements_current` (
   `NO_INDEX_USED` bigint(20) unsigned NOT NULL,
   `NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL,
+  `NESTING_EVENT_LEVEL` int(11) DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_statements_history;
 Table	Create Table
@@ -256,7 +291,8 @@ events_statements_history	CREATE TABLE `events_statements_history` (
   `NO_INDEX_USED` bigint(20) unsigned NOT NULL,
   `NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL,
+  `NESTING_EVENT_LEVEL` int(11) DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_statements_history_long;
 Table	Create Table
@@ -300,7 +336,8 @@ events_statements_history_long	CREATE TABLE `events_statements_history_long` (
   `NO_INDEX_USED` bigint(20) unsigned NOT NULL,
   `NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL,
+  `NESTING_EVENT_LEVEL` int(11) DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_statements_summary_by_digest;
 Table	Create Table
@@ -398,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(16) 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,
@@ -428,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(16) 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,
@@ -485,6 +522,195 @@ events_statements_summary_global_by_event_name	CREATE TABLE `events_statements_s
   `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL,
   `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_transactions_current;
+Table	Create Table
+events_transactions_current	CREATE TABLE `events_transactions_current` (
+  `THREAD_ID` bigint(20) unsigned NOT NULL,
+  `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `STATE` enum('ACTIVE','COMMITTED','ROLLED BACK') DEFAULT NULL,
+  `TRX_ID` bigint(20) unsigned DEFAULT NULL,
+  `GTID` varchar(64) DEFAULT NULL,
+  `XID_FORMAT_ID` int(11) DEFAULT NULL,
+  `XID_GTRID` varchar(130) DEFAULT NULL,
+  `XID_BQUAL` varchar(130) DEFAULT NULL,
+  `XA_STATE` varchar(64) DEFAULT NULL,
+  `SOURCE` varchar(64) DEFAULT NULL,
+  `TIMER_START` bigint(20) unsigned DEFAULT NULL,
+  `TIMER_END` bigint(20) unsigned DEFAULT NULL,
+  `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
+  `ACCESS_MODE` enum('READ ONLY','READ WRITE') DEFAULT NULL,
+  `ISOLATION_LEVEL` varchar(64) DEFAULT NULL,
+  `AUTOCOMMIT` enum('YES','NO') NOT NULL,
+  `NUMBER_OF_SAVEPOINTS` bigint(20) unsigned DEFAULT NULL,
+  `NUMBER_OF_ROLLBACK_TO_SAVEPOINT` bigint(20) unsigned DEFAULT NULL,
+  `NUMBER_OF_RELEASE_SAVEPOINT` bigint(20) unsigned DEFAULT NULL,
+  `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned DEFAULT NULL,
+  `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_transactions_history;
+Table	Create Table
+events_transactions_history	CREATE TABLE `events_transactions_history` (
+  `THREAD_ID` bigint(20) unsigned NOT NULL,
+  `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `STATE` enum('ACTIVE','COMMITTED','ROLLED BACK') DEFAULT NULL,
+  `TRX_ID` bigint(20) unsigned DEFAULT NULL,
+  `GTID` varchar(64) DEFAULT NULL,
+  `XID_FORMAT_ID` int(11) DEFAULT NULL,
+  `XID_GTRID` varchar(130) DEFAULT NULL,
+  `XID_BQUAL` varchar(130) DEFAULT NULL,
+  `XA_STATE` varchar(64) DEFAULT NULL,
+  `SOURCE` varchar(64) DEFAULT NULL,
+  `TIMER_START` bigint(20) unsigned DEFAULT NULL,
+  `TIMER_END` bigint(20) unsigned DEFAULT NULL,
+  `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
+  `ACCESS_MODE` enum('READ ONLY','READ WRITE') DEFAULT NULL,
+  `ISOLATION_LEVEL` varchar(64) DEFAULT NULL,
+  `AUTOCOMMIT` enum('YES','NO') NOT NULL,
+  `NUMBER_OF_SAVEPOINTS` bigint(20) unsigned DEFAULT NULL,
+  `NUMBER_OF_ROLLBACK_TO_SAVEPOINT` bigint(20) unsigned DEFAULT NULL,
+  `NUMBER_OF_RELEASE_SAVEPOINT` bigint(20) unsigned DEFAULT NULL,
+  `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned DEFAULT NULL,
+  `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_transactions_history_long;
+Table	Create Table
+events_transactions_history_long	CREATE TABLE `events_transactions_history_long` (
+  `THREAD_ID` bigint(20) unsigned NOT NULL,
+  `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `STATE` enum('ACTIVE','COMMITTED','ROLLED BACK') DEFAULT NULL,
+  `TRX_ID` bigint(20) unsigned DEFAULT NULL,
+  `GTID` varchar(64) DEFAULT NULL,
+  `XID_FORMAT_ID` int(11) DEFAULT NULL,
+  `XID_GTRID` varchar(130) DEFAULT NULL,
+  `XID_BQUAL` varchar(130) DEFAULT NULL,
+  `XA_STATE` varchar(64) DEFAULT NULL,
+  `SOURCE` varchar(64) DEFAULT NULL,
+  `TIMER_START` bigint(20) unsigned DEFAULT NULL,
+  `TIMER_END` bigint(20) unsigned DEFAULT NULL,
+  `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL,
+  `ACCESS_MODE` enum('READ ONLY','READ WRITE') DEFAULT NULL,
+  `ISOLATION_LEVEL` varchar(64) DEFAULT NULL,
+  `AUTOCOMMIT` enum('YES','NO') NOT NULL,
+  `NUMBER_OF_SAVEPOINTS` bigint(20) unsigned DEFAULT NULL,
+  `NUMBER_OF_ROLLBACK_TO_SAVEPOINT` bigint(20) unsigned DEFAULT NULL,
+  `NUMBER_OF_RELEASE_SAVEPOINT` bigint(20) unsigned DEFAULT NULL,
+  `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned DEFAULT NULL,
+  `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_transactions_summary_by_host_by_event_name;
+Table	Create Table
+events_transactions_summary_by_host_by_event_name	CREATE TABLE `events_transactions_summary_by_host_by_event_name` (
+  `HOST` char(60) 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,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `COUNT_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `COUNT_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_transactions_summary_by_thread_by_event_name;
+Table	Create Table
+events_transactions_summary_by_thread_by_event_name	CREATE TABLE `events_transactions_summary_by_thread_by_event_name` (
+  `THREAD_ID` bigint(20) unsigned NOT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `COUNT_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `COUNT_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_transactions_summary_by_user_by_event_name;
+Table	Create Table
+events_transactions_summary_by_user_by_event_name	CREATE TABLE `events_transactions_summary_by_user_by_event_name` (
+  `USER` char(32) 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,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `COUNT_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `COUNT_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_transactions_summary_by_account_by_event_name;
+Table	Create Table
+events_transactions_summary_by_account_by_event_name	CREATE TABLE `events_transactions_summary_by_account_by_event_name` (
+  `USER` char(32) 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,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `COUNT_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `COUNT_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_transactions_summary_global_by_event_name;
+Table	Create Table
+events_transactions_summary_global_by_event_name	CREATE TABLE `events_transactions_summary_global_by_event_name` (
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `COUNT_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_READ_WRITE` bigint(20) unsigned NOT NULL,
+  `COUNT_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_READ_ONLY` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_waits_current;
 Table	Create Table
 events_waits_current	CREATE TABLE `events_waits_current` (
@@ -503,7 +729,7 @@ events_waits_current	CREATE TABLE `events_waits_current` (
   `OBJECT_TYPE` varchar(64) DEFAULT NULL,
   `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL,
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL,
   `OPERATION` varchar(32) NOT NULL,
   `NUMBER_OF_BYTES` bigint(20) DEFAULT NULL,
   `FLAGS` int(10) unsigned DEFAULT NULL
@@ -526,7 +752,7 @@ events_waits_history	CREATE TABLE `events_waits_history` (
   `OBJECT_TYPE` varchar(64) DEFAULT NULL,
   `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL,
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL,
   `OPERATION` varchar(32) NOT NULL,
   `NUMBER_OF_BYTES` bigint(20) DEFAULT NULL,
   `FLAGS` int(10) unsigned DEFAULT NULL
@@ -549,7 +775,7 @@ events_waits_history_long	CREATE TABLE `events_waits_history_long` (
   `OBJECT_TYPE` varchar(64) DEFAULT NULL,
   `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL,
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL,
   `OPERATION` varchar(32) NOT NULL,
   `NUMBER_OF_BYTES` bigint(20) DEFAULT NULL,
   `FLAGS` int(10) unsigned DEFAULT NULL
@@ -590,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(16) 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,
@@ -601,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(16) 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,
@@ -620,6 +846,100 @@ events_waits_summary_global_by_event_name	CREATE TABLE `events_waits_summary_glo
   `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
   `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table memory_summary_by_host_by_event_name;
+Table	Create Table
+memory_summary_by_host_by_event_name	CREATE TABLE `memory_summary_by_host_by_event_name` (
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_ALLOC` bigint(20) unsigned NOT NULL,
+  `COUNT_FREE` bigint(20) unsigned NOT NULL,
+  `SUM_NUMBER_OF_BYTES_ALLOC` bigint(20) unsigned NOT NULL,
+  `SUM_NUMBER_OF_BYTES_FREE` bigint(20) unsigned NOT NULL,
+  `LOW_COUNT_USED` bigint(20) NOT NULL,
+  `CURRENT_COUNT_USED` bigint(20) NOT NULL,
+  `HIGH_COUNT_USED` bigint(20) NOT NULL,
+  `LOW_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL,
+  `CURRENT_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL,
+  `HIGH_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table memory_summary_by_thread_by_event_name;
+Table	Create Table
+memory_summary_by_thread_by_event_name	CREATE TABLE `memory_summary_by_thread_by_event_name` (
+  `THREAD_ID` bigint(20) unsigned NOT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_ALLOC` bigint(20) unsigned NOT NULL,
+  `COUNT_FREE` bigint(20) unsigned NOT NULL,
+  `SUM_NUMBER_OF_BYTES_ALLOC` bigint(20) unsigned NOT NULL,
+  `SUM_NUMBER_OF_BYTES_FREE` bigint(20) unsigned NOT NULL,
+  `LOW_COUNT_USED` bigint(20) NOT NULL,
+  `CURRENT_COUNT_USED` bigint(20) NOT NULL,
+  `HIGH_COUNT_USED` bigint(20) NOT NULL,
+  `LOW_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL,
+  `CURRENT_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL,
+  `HIGH_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table memory_summary_by_user_by_event_name;
+Table	Create Table
+memory_summary_by_user_by_event_name	CREATE TABLE `memory_summary_by_user_by_event_name` (
+  `USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_ALLOC` bigint(20) unsigned NOT NULL,
+  `COUNT_FREE` bigint(20) unsigned NOT NULL,
+  `SUM_NUMBER_OF_BYTES_ALLOC` bigint(20) unsigned NOT NULL,
+  `SUM_NUMBER_OF_BYTES_FREE` bigint(20) unsigned NOT NULL,
+  `LOW_COUNT_USED` bigint(20) NOT NULL,
+  `CURRENT_COUNT_USED` bigint(20) NOT NULL,
+  `HIGH_COUNT_USED` bigint(20) NOT NULL,
+  `LOW_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL,
+  `CURRENT_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL,
+  `HIGH_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table memory_summary_by_account_by_event_name;
+Table	Create Table
+memory_summary_by_account_by_event_name	CREATE TABLE `memory_summary_by_account_by_event_name` (
+  `USER` char(32) 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_ALLOC` bigint(20) unsigned NOT NULL,
+  `COUNT_FREE` bigint(20) unsigned NOT NULL,
+  `SUM_NUMBER_OF_BYTES_ALLOC` bigint(20) unsigned NOT NULL,
+  `SUM_NUMBER_OF_BYTES_FREE` bigint(20) unsigned NOT NULL,
+  `LOW_COUNT_USED` bigint(20) NOT NULL,
+  `CURRENT_COUNT_USED` bigint(20) NOT NULL,
+  `HIGH_COUNT_USED` bigint(20) NOT NULL,
+  `LOW_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL,
+  `CURRENT_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL,
+  `HIGH_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table memory_summary_global_by_event_name;
+Table	Create Table
+memory_summary_global_by_event_name	CREATE TABLE `memory_summary_global_by_event_name` (
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_ALLOC` bigint(20) unsigned NOT NULL,
+  `COUNT_FREE` bigint(20) unsigned NOT NULL,
+  `SUM_NUMBER_OF_BYTES_ALLOC` bigint(20) unsigned NOT NULL,
+  `SUM_NUMBER_OF_BYTES_FREE` bigint(20) unsigned NOT NULL,
+  `LOW_COUNT_USED` bigint(20) NOT NULL,
+  `CURRENT_COUNT_USED` bigint(20) NOT NULL,
+  `HIGH_COUNT_USED` bigint(20) NOT NULL,
+  `LOW_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL,
+  `CURRENT_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL,
+  `HIGH_NUMBER_OF_BYTES_USED` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table metadata_locks;
+Table	Create Table
+metadata_locks	CREATE TABLE `metadata_locks` (
+  `OBJECT_TYPE` varchar(64) NOT NULL,
+  `OBJECT_SCHEMA` varchar(64) DEFAULT NULL,
+  `OBJECT_NAME` varchar(64) DEFAULT NULL,
+  `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL,
+  `LOCK_TYPE` varchar(32) NOT NULL,
+  `LOCK_DURATION` varchar(32) NOT NULL,
+  `LOCK_STATUS` varchar(32) NOT NULL,
+  `SOURCE` varchar(64) DEFAULT NULL,
+  `OWNER_THREAD_ID` bigint(20) unsigned DEFAULT NULL,
+  `OWNER_EVENT_ID` bigint(20) unsigned DEFAULT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table file_instances;
 Table	Create Table
 file_instances	CREATE TABLE `file_instances` (
@@ -762,8 +1082,10 @@ 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(16) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%',
-  `ROLE` char(16) 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'
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table setup_consumers;
 Table	Create Table
@@ -781,7 +1103,7 @@ setup_instruments	CREATE TABLE `setup_instruments` (
 show create table setup_objects;
 Table	Create Table
 setup_objects	CREATE TABLE `setup_objects` (
-  `OBJECT_TYPE` enum('TABLE') NOT NULL DEFAULT 'TABLE',
+  `OBJECT_TYPE` enum('EVENT','FUNCTION','PROCEDURE','TABLE','TRIGGER') NOT NULL DEFAULT 'TABLE',
   `OBJECT_SCHEMA` varchar(64) DEFAULT '%',
   `OBJECT_NAME` varchar(64) NOT NULL DEFAULT '%',
   `ENABLED` enum('YES','NO') NOT NULL DEFAULT 'YES',
@@ -859,6 +1181,18 @@ socket_summary_by_event_name	CREATE TABLE `socket_summary_by_event_name` (
   `AVG_TIMER_MISC` bigint(20) unsigned NOT NULL,
   `MAX_TIMER_MISC` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table table_handles;
+Table	Create Table
+table_handles	CREATE TABLE `table_handles` (
+  `OBJECT_TYPE` varchar(64) NOT NULL,
+  `OBJECT_SCHEMA` varchar(64) NOT NULL,
+  `OBJECT_NAME` varchar(64) NOT NULL,
+  `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL,
+  `OWNER_THREAD_ID` bigint(20) unsigned DEFAULT NULL,
+  `OWNER_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
+  `INTERNAL_LOCK` varchar(64) DEFAULT NULL,
+  `EXTERNAL_LOCK` varchar(64) DEFAULT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table table_io_waits_summary_by_index_usage;
 Table	Create Table
 table_io_waits_summary_by_index_usage	CREATE TABLE `table_io_waits_summary_by_index_usage` (
@@ -1028,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(16) 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,
@@ -1037,12 +1371,15 @@ threads	CREATE TABLE `threads` (
   `PROCESSLIST_INFO` longtext DEFAULT NULL,
   `PARENT_THREAD_ID` bigint(20) unsigned DEFAULT NULL,
   `ROLE` varchar(64) DEFAULT NULL,
-  `INSTRUMENTED` enum('YES','NO') NOT NULL
+  `INSTRUMENTED` enum('YES','NO') NOT NULL,
+  `HISTORY` enum('YES','NO') NOT NULL,
+  `CONNECTION_TYPE` varchar(16) DEFAULT NULL,
+  `THREAD_OS_ID` bigint(20) unsigned DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table users;
 Table	Create Table
 users	CREATE TABLE `users` (
-  `USER` char(16) 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/server_init.result b/mysql-test/suite/perfschema/r/server_init.result
index d2f370cf00a..82f53ad5b74 100644
--- a/mysql-test/suite/perfschema/r/server_init.result
+++ b/mysql-test/suite/perfschema/r/server_init.result
@@ -1,9 +1,5 @@
 use performance_schema;
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/mysys/THR_LOCK_threads";
-count(name)
-1
-select count(name) from mutex_instances
 where name like "wait/synch/mutex/mysys/THR_LOCK_malloc";
 count(name)
 1
@@ -27,12 +23,16 @@ select count(name) from mutex_instances
 where name like "wait/synch/mutex/mysys/THR_LOCK_charset";
 count(name)
 1
-select count(name) from cond_instances
-where name like "wait/synch/cond/mysys/THR_COND_threads";
+select count(name) from mutex_instances
+<<<<<<< HEAD
+where name like "wait/synch/mutex/sql/LOCK_thread_count";
+=======
+where name like "wait/synch/mutex/sql/LOCK_open";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_thread_count";
+where name like "wait/synch/mutex/sql/LOCK_thd_list";
+>>>>>>> merge-perfschema-5.7
 count(name)
 1
 select count(name) from mutex_instances
@@ -44,31 +44,19 @@ where name like "wait/synch/mutex/sql/LOCK_status";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_error_log";
-count(name)
-1
-select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_delayed_insert";
-count(name)
-1
-select count(name) from mutex_instances
 where name like "wait/synch/mutex/sql/LOCK_uuid_generator";
 count(name)
 0
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_delayed_status";
-count(name)
-1
-select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_delayed_create";
-count(name)
-1
-select count(name) from mutex_instances
 where name like "wait/synch/mutex/sql/LOCK_crypt";
 count(name)
 1
 select count(name) from mutex_instances
+<<<<<<< HEAD
 where name like "wait/synch/mutex/sql/LOCK_active_mi";
+=======
+where name like "wait/synch/mutex/sql/LOCK_slave_list";
+>>>>>>> 258e16fa2de... WIP 5.7 P_S
 count(name)
 1
 select count(name) from mutex_instances
@@ -100,18 +88,21 @@ where name like "wait/synch/mutex/sql/LOCK_event_queue";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_user_locks";
+where name like "wait/synch/mutex/sql/LOCK_item_func_sleep";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/Cversion_lock";
+where name like "wait/synch/mutex/sql/LOCK_audit_mask";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_audit_mask";
+<<<<<<< HEAD
+=======
+where name like "wait/synch/mutex/sql/LOCK_transaction_cache";
 count(name)
 1
 select count(name) from mutex_instances
+>>>>>>> merge-perfschema-5.7
 where name like "wait/synch/mutex/sql/LOCK_plugin";
 count(name)
 1
@@ -120,10 +111,6 @@ where name like "wait/synch/mutex/sql/tz_LOCK";
 count(name)
 1
 select count(name) from rwlock_instances
-where name like "wait/synch/rwlock/sql/LOCK_grant";
-count(name)
-1
-select count(name) from rwlock_instances
 where name like "wait/synch/rwlock/sql/LOCK_sys_init_connect";
 count(name)
 1
@@ -146,7 +133,7 @@ count(name)
 select count(name) from cond_instances
 where name like "wait/synch/cond/sql/COND_thread_count";
 count(name)
-1
+0
 select count(name) from cond_instances
 where name like "wait/synch/cond/sql/COND_manager";
 count(name)
diff --git a/mysql-test/suite/perfschema/r/setup_actors.result b/mysql-test/suite/perfschema/r/setup_actors.result
index 3474b678321..b6d528173bf 100644
--- a/mysql-test/suite/perfschema/r/setup_actors.result
+++ b/mysql-test/suite/perfschema/r/setup_actors.result
@@ -1,22 +1,22 @@
 select * from performance_schema.setup_actors;
-HOST	USER	ROLE
-%	%	%
+HOST	USER	ROLE	ENABLED	HISTORY
+%	%	%	YES	YES
 truncate table performance_schema.setup_actors;
 insert into performance_schema.setup_actors
-values ('hosta', 'user1', '%');
+values ('hosta', 'user1', '%', 'YES', 'YES');
 insert into performance_schema.setup_actors
-values ('%', 'user2', '%');
+values ('%', 'user2', '%', 'YES', 'YES');
 insert into performance_schema.setup_actors
-values ('localhost', 'user3', '%');
+values ('localhost', 'user3', '%', 'YES', 'YES');
 insert into performance_schema.setup_actors
-values ('hostb', '%', '%');
+values ('hostb', '%', '%', 'YES', 'YES');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-hostb	%	%
-hosta	user1	%
-%	user2	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+hostb	%	%	YES	YES
+hosta	user1	%	YES	YES
+%	user2	%	YES	YES
+localhost	user3	%	YES	YES
 create user user1@localhost;
 grant ALL on *.* to user1@localhost;
 create user user2@localhost;
@@ -36,7 +36,7 @@ NAME	TYPE	INSTRUMENTED	PROCESSLIST_USER	PROCESSLIST_HOST
 thread/sql/one_connection	FOREGROUND	NO	user1	localhost
 connection default;
 insert into performance_schema.setup_actors
-values ('%', 'user1', '%');
+values ('%', 'user1', '%', 'YES', 'YES');
 connection con1;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
@@ -90,16 +90,16 @@ thread/sql/one_connection	FOREGROUND	NO	user4	localhost
 disconnect con4;
 connection default;
 insert into performance_schema.setup_actors
-values ('localhost', '%', '%');
+values ('localhost', '%', '%', 'YES', 'YES');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-hostb	%	%
-localhost	%	%
-%	user1	%
-hosta	user1	%
-%	user2	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+hostb	%	%	YES	YES
+localhost	%	%	YES	YES
+%	user1	%	YES	YES
+hosta	user1	%	YES	YES
+%	user2	%	YES	YES
+localhost	user3	%	YES	YES
 connect  con4b, localhost, user4, , ;
 select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
@@ -109,7 +109,7 @@ thread/sql/one_connection	FOREGROUND	YES	user4	localhost
 disconnect con4b;
 connection default;
 insert into performance_schema.setup_actors
-values ('%', 'user5', '%');
+values ('%', 'user5', '%', 'YES', 'YES');
 create sql security definer view test.v1 as select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
@@ -135,7 +135,7 @@ drop user user5@localhost;
 flush privileges;
 truncate table performance_schema.setup_actors;
 insert into performance_schema.setup_actors
-values ('%', '%', '%');
+values ('%', '%', '%', 'YES', 'YES');
 select * from performance_schema.setup_actors;
-HOST	USER	ROLE
-%	%	%
+HOST	USER	ROLE	ENABLED	HISTORY
+%	%	%	YES	YES
diff --git a/mysql-test/suite/perfschema/r/setup_actors_enabled.result b/mysql-test/suite/perfschema/r/setup_actors_enabled.result
new file mode 100644
index 00000000000..c0dda748f28
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/setup_actors_enabled.result
@@ -0,0 +1,136 @@
+select * from performance_schema.setup_actors;
+HOST	USER	ROLE	ENABLED	HISTORY
+%	%	%	YES	YES
+truncate table performance_schema.setup_actors;
+insert into performance_schema.setup_actors
+values ('localhost', 'user1', '%', 'YES', 'YES');
+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',''));
+grant ALL on *.* to user1@localhost;
+grant ALL on *.* to user2@localhost;
+set sql_mode= @orig_sql_mode;
+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
+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;
+drop user user2@localhost;
+flush privileges;
+truncate table performance_schema.setup_actors;
+insert into performance_schema.setup_actors
+values ('%', '%', '%', 'YES', 'YES');
+select * from performance_schema.setup_actors;
+HOST	USER	ROLE	ENABLED	HISTORY
+%	%	%	YES	YES
diff --git a/mysql-test/suite/perfschema/r/setup_actors_history.result b/mysql-test/suite/perfschema/r/setup_actors_history.result
new file mode 100644
index 00000000000..cbf531911f8
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/setup_actors_history.result
@@ -0,0 +1,138 @@
+select * from performance_schema.setup_actors;
+HOST	USER	ROLE	ENABLED	HISTORY
+%	%	%	YES	YES
+truncate table performance_schema.setup_actors;
+insert into performance_schema.setup_actors
+values ('localhost', 'user1', '%', 'YES', 'YES');
+insert into performance_schema.setup_actors
+values ('localhost', 'user2', '%', 'YES', 'NO');
+insert into performance_schema.setup_actors
+values ('localhost', 'user3', '%', 'NO', 'YES');
+insert into performance_schema.setup_actors
+values ('localhost', 'user4', '%', 'NO', 'NO');
+create user user1@localhost;
+create user user2@localhost;
+create user user3@localhost;
+create user user4@localhost;
+grant ALL on *.* to user1@localhost;
+grant ALL on *.* to user2@localhost;
+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;
+revoke all privileges, grant option from user4@localhost;
+drop user user1@localhost;
+drop user user2@localhost;
+drop user user3@localhost;
+drop user user4@localhost;
+flush privileges;
+truncate table performance_schema.setup_actors;
+insert into performance_schema.setup_actors
+values ('%', '%', '%', 'YES', 'YES');
+select * from performance_schema.setup_actors;
+HOST	USER	ROLE	ENABLED	HISTORY
+%	%	%	YES	YES
diff --git a/mysql-test/suite/perfschema/r/setup_consumers_defaults.result b/mysql-test/suite/perfschema/r/setup_consumers_defaults.result
index c6e03513d75..c3ec620a2a6 100644
--- a/mysql-test/suite/perfschema/r/setup_consumers_defaults.result
+++ b/mysql-test/suite/perfschema/r/setup_consumers_defaults.result
@@ -6,6 +6,9 @@ events_stages_history_long	NO
 events_statements_current	YES
 events_statements_history	NO
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	NO
+events_transactions_history_long	YES
 events_waits_current	NO
 events_waits_history	YES
 events_waits_history_long	NO
@@ -16,5 +19,5 @@ SELECT @@performance_schema_consumer_events_stages_current;
 ERROR HY000: Unknown system variable 'performance_schema_consumer_events_stages_current'
 SET @@performance_schema_consumer_events_stages_current=0;
 ERROR HY000: Unknown system variable 'performance_schema_consumer_events_stages_current'
-SHOW VARIABLES LIKE "performance_schema_consumer%";
+SHOW GLOBAL VARIABLES LIKE "performance_schema_consumer%";
 Variable_name	Value
diff --git a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result
index 7384313917d..4c638197235 100644
--- a/mysql-test/suite/perfschema/r/setup_instruments_defaults.result
+++ b/mysql-test/suite/perfschema/r/setup_instruments_defaults.result
@@ -10,21 +10,20 @@ WHERE name IN (
 AND enabled = 'yes' AND timed = 'no'
 ORDER BY name;
 NAME	ENABLED	TIMED
-stage/sql/Creating table	YES	NO
+stage/sql/creating table	YES	NO
 wait/synch/mutex/sql/LOCK_plugin	YES	NO
 wait/synch/mutex/sql/LOCK_user_conn	YES	NO
 SELECT * FROM performance_schema.setup_instruments
-WHERE name = 'wait/synch/mutex/sql/LOCK_thread_count'
+WHERE name = 'wait/synch/mutex/sql/LOCK_thd_list'
 AND enabled = 'no' AND timed = 'no';
 NAME	ENABLED	TIMED
 SELECT * FROM performance_schema.setup_instruments
 WHERE name IN (
 'wait/synch/mutex/sql/LOG_INFO::lock',
-'wait/synch/mutex/sql/THD::LOCK_thd_data')
+'wait/synch/mutex/sql/THD::LOCK_thd_list')
 AND enabled = 'yes' AND timed = 'yes'
 ORDER BY name;
 NAME	ENABLED	TIMED
-wait/synch/mutex/sql/THD::LOCK_thd_data	YES	YES
 SELECT * FROM performance_schema.setup_instruments
 WHERE name = 'wait/synch/mutex/sql/hash_filo::lock'
 AND enabled = 'no' AND timed = 'no'
@@ -32,6 +31,20 @@ ORDER BY name;
 NAME	ENABLED	TIMED
 wait/synch/mutex/sql/hash_filo::lock	NO	NO
 #
+# Verify that the memory instruments are never timed
+#
+SELECT * FROM performance_schema.setup_instruments
+WHERE name like 'memory/%'
+AND timed = 'YES';
+NAME	ENABLED	TIMED
+#
+# Verify that the memory/performance_schema instruments are never disabled
+#
+SELECT * FROM performance_schema.setup_instruments
+WHERE name like 'memory/performance_schema/%'
+AND enabled = 'NO';
+NAME	ENABLED	TIMED
+#
 # Verify that the instrument startup settings are not not visible.
 #
 SHOW VARIABLES LIKE "%/wait/synch/mutex%";
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
new file mode 100644
index 00000000000..97fda63d7ee
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/setup_object_table_lock_io.result
@@ -0,0 +1,91 @@
+drop table if exists test.setup_objects;
+update performance_schema.setup_instruments set enabled='NO';
+update performance_schema.setup_instruments set enabled='YES', timed='YES'
+  where name in ('wait/io/table/sql/handler', 'wait/lock/table/sql/handler');
+truncate table performance_schema.table_io_waits_summary_by_table;
+truncate table performance_schema.table_lock_waits_summary_by_table;
+create table test.setup_objects as select * from performance_schema.setup_objects;
+truncate table performance_schema.setup_objects;
+select * from performance_schema.setup_objects;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+insert into performance_schema.setup_objects
+values ('TABLE', 'db1', 't1', 'YES', 'YES');
+insert into performance_schema.setup_objects
+values ('TABLE', 'db1', 't2', 'YES', 'YES');
+select * from performance_schema.setup_objects
+order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+TABLE	db1	t1	YES	YES
+TABLE	db1	t2	YES	YES
+SET sql_mode = default;
+drop database if exists db1;
+create database db1;
+create table db1.t1 (a int, b char(10) default 'default', unique key uidx(a));
+create table db1.t2 (a int, b char(10) default 'default');
+insert into db1.t1 values('11', 'db1.t1');
+insert into db1.t1 values('12', 'db1.t1');
+insert into db1.t1 values('13', 'db1.t1');
+insert into db1.t2 values('21', 'db1.t2');
+insert into db1.t2 values('22', 'db1.t2');
+insert into db1.t2 values('23', 'db1.t2');
+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	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';
+OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
+db1	t1	3	0	3
+db1	t2	3	0	3
+truncate table db1.t1;
+truncate table db1.t2;
+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	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';
+OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
+db1	t1	3	0	3
+db1	t2	3	0	3
+update performance_schema.setup_objects
+set ENABLED='NO' where OBJECT_SCHEMA = 'db1' and OBJECT_NAME='t1';
+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	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';
+OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
+db1	t2	3	0	3
+update performance_schema.setup_objects
+set ENABLED='YES' where OBJECT_SCHEMA = 'db1' and OBJECT_NAME='t1';
+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	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';
+OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_READ	COUNT_WRITE
+db1	t1	0	0	0
+db1	t2	3	0	3
+truncate table performance_schema.setup_objects;
+select count(*) from performance_schema.setup_objects;
+count(*)
+0
+drop database db1;
+truncate table performance_schema.setup_objects;
+insert into performance_schema.setup_objects select * from test.setup_objects;
+drop table test.setup_objects;
+update performance_schema.setup_instruments set enabled='YES', timed='YES';
diff --git a/mysql-test/suite/perfschema/r/setup_objects.result b/mysql-test/suite/perfschema/r/setup_objects.result
index c29aaa2114f..ec9a0089b8d 100644
--- a/mysql-test/suite/perfschema/r/setup_objects.result
+++ b/mysql-test/suite/perfschema/r/setup_objects.result
@@ -25,7 +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');
-set sql_mode= '';
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
 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
@@ -82,7 +82,7 @@ TABLE	db3	t1	YES	YES
 TABLE	db3	t2	NO	NO
 TABLE	db4	%	YES	NO
 TABLE	db4	t1	NO	YES
-set sql_mode= DEFAULT;
+SET sql_mode = default;
 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 45f7d989d8e..ab3a13b8eed 100644
--- a/mysql-test/suite/perfschema/r/short_option_1.result
+++ b/mysql-test/suite/perfschema/r/short_option_1.result
@@ -4,20 +4,20 @@ Ok, the server started
 select @@SQL_MODE;
 @@SQL_MODE
 REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
-show variables like 'sql_mode';
+show global variables like 'sql_mode';
 Variable_name	Value
 sql_mode	REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
 select @@character_set_server;
 @@character_set_server
 utf8
-show variables like 'character_set_system';
+show global variables like 'character_set_system';
 Variable_name	Value
 character_set_system	utf8
-show variables like 'general_log';
+show global variables like 'general_log';
 Variable_name	Value
 general_log	ON
-show variables like 'new';
+show global variables like 'new';
 Variable_name	Value
-show variables like 'log_warnings';
+show global variables like 'log_warnings';
 Variable_name	Value
-log_warnings	3
+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 0587fdef73b..6b5b06cb4a1 100644
--- a/mysql-test/suite/perfschema/r/short_option_2.result
+++ b/mysql-test/suite/perfschema/r/short_option_2.result
@@ -6,4 +6,4 @@ select @@SQL_MODE;
 REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
 select @@log_warnings;
 @@log_warnings
-5
+2
diff --git a/mysql-test/suite/perfschema/r/show_aggregate.result b/mysql-test/suite/perfschema/r/show_aggregate.result
new file mode 100644
index 00000000000..7b9e3889bc6
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/show_aggregate.result
@@ -0,0 +1,530 @@
+
+================================================================================
+SETUP
+================================================================================
+SET @@session.sql_log_bin=OFF;
+
+# CREATE 3 CLIENTS, 3 CONNECTIONS, RESULTS TABLE
+connection default;
+USE test;
+
+# Create results table
+CREATE TABLE test.status_results 
+(variable_name VARCHAR(64), start INT DEFAULT 0, stop INT DEFAULT 0, delta INT DEFAULT 0, 
+t1 INT DEFAULT 0, t2 INT DEFAULT 0, t3 INT DEFAULT 0, thread INT DEFAULT 0, 
+u1 INT DEFAULT 0, u2 INT DEFAULT 0, u3 INT DEFAULT 0, user INT DEFAULT 0, 
+h1 INT DEFAULT 0, h2 INT DEFAULT 0, h3 INT DEFAULT 0, host INT DEFAULT 0, 
+a1 INT DEFAULT 0, a2 INT DEFAULT 0, a3 INT DEFAULT 0, acct INT DEFAULT 0);
+INSERT INTO test.status_results (variable_name, start) 
+SELECT sg.variable_name, sg.variable_value+0 FROM performance_schema.global_status sg
+WHERE variable_name IN ('handler_delete', 'handler_rollback');
+
+# Create test tables
+CREATE TABLE t1 (s1 int) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1), (2), (2), (3), (3), (3);
+CREATE TABLE t2 (s1 int) ENGINE=InnoDB;
+CREATE TABLE t3 (s1 int) ENGINE=InnoDB;
+
+set @orig_sql_mode= @@sql_mode;
+set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
+GRANT ALL ON *.* to 'user1'@localhost;
+GRANT ALL ON *.* to 'user2'@localhost;
+GRANT ALL ON *.* to 'user3'@localhost;
+set sql_mode= @orig_sql_mode;
+
+================================================================================
+CONNECTION 1: DELETE 1, ROLLBACK x 1
+================================================================================
+connect con1, localhost, user1,,;
+SET @@session.sql_log_bin=OFF;
+DELETE FROM t1 WHERE s1 = 1;
+START TRANSACTION;
+INSERT INTO t1 VALUES (1);
+ROLLBACK;
+
+================================================================================
+CONNECTION 2: DELETE 2, ROLLBACK x 2
+================================================================================
+connect con2, localhost, user2,,;
+SET @@session.sql_log_bin=OFF;
+DELETE FROM t1 WHERE s1 = 2;
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (2);
+ROLLBACK;
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (2);
+ROLLBACK;
+
+================================================================================
+CONNECTION 3: DELETE 3, ROLLBACK x 3
+================================================================================
+connect con3, localhost, user3,,;
+SET @@session.sql_log_bin=OFF;
+DELETE FROM t1 WHERE s1 = 3;
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (3);
+ROLLBACK;
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (3);
+ROLLBACK;
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (3);
+ROLLBACK;
+
+================================================================================
+CONNECTION DEFAULT: Gather results, compare session and global status counts
+================================================================================
+connection default;
+# Get thread ids for each connection.
+USE performance_schema;
+SELECT thread_id INTO @con1_id FROM threads WHERE processlist_user IN ('user1');
+SELECT thread_id INTO @con2_id FROM threads WHERE processlist_user IN ('user2');
+SELECT thread_id INTO @con3_id FROM threads WHERE processlist_user IN ('user3');
+#=================
+# Global results
+#=================
+USE test;
+UPDATE test.status_results sr, performance_schema.global_status sg
+SET sr.stop = sg.variable_value
+WHERE sr.variable_name = sg.variable_name
+AND sg.variable_name IN ('handler_delete', 'handler_rollback');
+
+# Global deltas: END - START.
+UPDATE test.status_results sr
+SET sr.delta = sr.stop - sr.start;
+#=================
+# Status by thread
+#=================
+# Thread results from CON1.
+UPDATE test.status_results sr, performance_schema.status_by_thread sbt
+SET sr.t1 = sbt.variable_value
+WHERE sr.variable_name = sbt.variable_name
+AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbt.thread_id = @con1_id;
+
+# Thread results from CON2.
+UPDATE test.status_results sr, performance_schema.status_by_thread sbt
+SET sr.t2 = sbt.variable_value
+WHERE sr.variable_name = sbt.variable_name
+AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbt.thread_id = @con2_id;
+
+# Thread results from CON3.
+UPDATE test.status_results sr, performance_schema.status_by_thread sbt
+SET sr.t3 = sbt.variable_value
+WHERE sr.variable_name = sbt.variable_name
+AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbt.thread_id = @con3_id;
+
+# Thread totals for 3 connections.
+UPDATE test.status_results sr
+SET sr.thread = sr.t1 + sr.t2 + sr.t3;
+#=================
+# Status by user
+#=================
+# User1
+UPDATE test.status_results sr, performance_schema.status_by_user sbu
+SET sr.u1 = sbu.variable_value
+WHERE sr.variable_name = sbu.variable_name
+AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbu.user IN ('user1');
+
+# User2
+UPDATE test.status_results sr, performance_schema.status_by_user sbu
+SET sr.u2 = sbu.variable_value
+WHERE sr.variable_name = sbu.variable_name
+AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbu.user IN ('user2');
+
+# User3
+UPDATE test.status_results sr, performance_schema.status_by_user sbu
+SET sr.u3 = sbu.variable_value
+WHERE sr.variable_name = sbu.variable_name
+AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbu.user IN ('user3');
+
+# Status totals for 3 users.
+UPDATE test.status_results sr
+SET sr.user = sr.u1 + sr.u2 + sr.u3;
+#===========================
+# Status by host (localhost)
+#===========================
+
+# host1 = localhost
+UPDATE test.status_results sr, performance_schema.status_by_host sbh
+SET sr.h1 = sbh.variable_value
+WHERE sr.variable_name = sbh.variable_name
+AND sbh.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbh.host IN ('localhost');
+
+# Status totals for 'localhost' only.
+UPDATE test.status_results sr
+SET sr.host = sr.h1 + sr.h2 + sr.h3;
+#==================
+# Status by account
+#==================
+# User1@localhost
+UPDATE test.status_results sr, performance_schema.status_by_account sba
+SET sr.a1 = sba.variable_value
+WHERE sr.variable_name = sba.variable_name
+AND sba.variable_name IN ('handler_delete', 'handler_rollback')
+AND sba.user IN ('user1');
+
+# User2@localhost
+UPDATE test.status_results sr, performance_schema.status_by_account sba
+SET sr.a2 = sba.variable_value
+WHERE sr.variable_name = sba.variable_name
+AND sba.variable_name IN ('handler_delete', 'handler_rollback')
+AND sba.user IN ('user2');
+
+# User3@localhost
+UPDATE test.status_results sr, performance_schema.status_by_account sba
+SET sr.a3 = sba.variable_value
+WHERE sr.variable_name = sba.variable_name
+AND sba.variable_name IN ('handler_delete', 'handler_rollback')
+AND sba.user IN ('user3');
+
+
+# Status totals for 3 accounts.
+UPDATE test.status_results sr
+SET sr.acct = sr.a1 + sr.a2 + sr.a3;
+
+================================================================================
+TEST 1: STATUS_BY_THREAD: Verify expected status counts per thread (1,2,3)
+================================================================================
+#
+# Review per-thread status counts
+#
+USE performance_schema;
+SELECT * FROM status_by_thread WHERE thread_id IN (@con1_id, @con2_id, @con3_id) AND variable_name IN ('handler_delete', 'handler_rollback') ORDER BY thread_id;
+THREAD_ID	VARIABLE_NAME	VARIABLE_VALUE
+thread_id	Handler_delete	1
+thread_id	Handler_rollback	1
+thread_id	Handler_delete	2
+thread_id	Handler_rollback	2
+thread_id	Handler_delete	3
+thread_id	Handler_rollback	3
+#
+# Verify expected counts for 'handler_delete' per thread
+# 
+SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con1_id AND variable_name IN ('handler_delete');
+THREAD_ID	VARIABLE_NAME	VARIABLE_VALUE	Expected
+connect_1	Handler_delete	1	OK
+
+SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con2_id AND variable_name IN ('handler_delete');
+THREAD_ID	VARIABLE_NAME	VARIABLE_VALUE	Expected
+connnect_2	Handler_delete	2	OK
+
+SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con3_id AND variable_name IN ('handler_delete');
+THREAD_ID	VARIABLE_NAME	VARIABLE_VALUE	Expected
+connnect_3	Handler_delete	3	OK
+#
+# STATUS_BY_THREAD vs. GLOBAL_STATUS
+#
+SELECT variable_name, t1, t2, t3, delta, thread, IF(thread=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+variable_name	t1	t2	t3	delta	thread	Expected
+Handler_delete	1	2	3	6	6	OK
+Handler_rollback	1	2	3	6	6	OK
+
+================================================================================
+TEST 2: STATUS_BY_USER: Verify expected status counts per user (1,2,3)
+================================================================================
+SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete');
+USER	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user1	Handler_delete	1	OK
+
+SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete');
+USER	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user2	Handler_delete	2	OK
+
+SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete');
+USER	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user3	Handler_delete	3	OK
+#
+# STATUS_BY_USER vs. GLOBAL_STATUS
+#
+SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+variable_name	u1	u2	u3	delta	user	Expected
+Handler_delete	1	2	3	6	6	OK
+Handler_rollback	1	2	3	6	6	OK
+
+================================================================================
+TEST 3: STATUS_BY_ACCOUNT: Verify expected status counts per user, host (1,2,3)
+================================================================================
+SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete');
+USER	HOST	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user1	localhost	Handler_delete	1	OK
+
+SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete');
+USER	HOST	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user2	localhost	Handler_delete	2	OK
+
+SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete');
+USER	HOST	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user3	localhost	Handler_delete	3	OK
+#
+# STATUS_BY_ACCOUNT vs. GLOBAL_STATUS
+#
+SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+variable_name	a1	a2	a3	delta	acct	Expected
+Handler_delete	1	2	3	6	6	OK
+Handler_rollback	1	2	3	6	6	OK
+================================================================================
+TEST 4: STATUS_BY_HOST: Verify expected status counts per host (6)
+================================================================================
+SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
+HOST	VARIABLE_NAME	VARIABLE_VALUE	Expected
+localhost	Handler_delete	6	OK
+#
+# STATUS_BY_HOST vs. GLOBAL_STATUS
+#
+# Special case: No way to isolate pre-existing 'localhost' activity, so
+# just check global totals = sum(status_by_host).
+#
+SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+variable_name	h1	h2	h3	delta	host	Expected
+Handler_delete	6	0	0	6	6	OK
+Handler_rollback	6	0	0	6	6	OK
+
+================================================================================
+DISCONNECT ALL USERS AND RUN THE TESTS AGAIN. RESULTS SHOULD NOT CHANGE.
+================================================================================
+connection default;
+disconnect con1;
+disconnect con2;
+disconnect con3;
+
+USE test;
+
+# Clear results table, leave initial global_status counts
+UPDATE test.status_results
+SET stop=0, delta=0,
+t1=0, t2=0, t3=0, thread=0,
+u1=0, u2=0, u3=0, user=0,
+h1=0, h2=0, h3=0, host=0,
+a1=0, a2=0, a3=0, acct=0;
+
+#=================
+# Global results
+#=================
+USE test;
+UPDATE test.status_results sr, performance_schema.global_status sg
+SET sr.stop = sg.variable_value
+WHERE sr.variable_name = sg.variable_name
+AND sg.variable_name IN ('handler_delete', 'handler_rollback');
+
+# Global deltas: END - START.
+UPDATE test.status_results sr
+SET sr.delta = sr.stop - sr.start;
+#=================
+# Status by thread
+#=================
+# Thread results from CON1.
+UPDATE test.status_results sr, performance_schema.status_by_thread sbt
+SET sr.t1 = sbt.variable_value
+WHERE sr.variable_name = sbt.variable_name
+AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbt.thread_id = @con1_id;
+
+# Thread results from CON2.
+UPDATE test.status_results sr, performance_schema.status_by_thread sbt
+SET sr.t2 = sbt.variable_value
+WHERE sr.variable_name = sbt.variable_name
+AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbt.thread_id = @con2_id;
+
+# Thread results from CON3.
+UPDATE test.status_results sr, performance_schema.status_by_thread sbt
+SET sr.t3 = sbt.variable_value
+WHERE sr.variable_name = sbt.variable_name
+AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbt.thread_id = @con3_id;
+
+# Thread totals for 3 connections.
+UPDATE test.status_results sr
+SET sr.thread = sr.t1 + sr.t2 + sr.t3;
+#=================
+# Status by user
+#=================
+# User1
+UPDATE test.status_results sr, performance_schema.status_by_user sbu
+SET sr.u1 = sbu.variable_value
+WHERE sr.variable_name = sbu.variable_name
+AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbu.user IN ('user1');
+
+# User2
+UPDATE test.status_results sr, performance_schema.status_by_user sbu
+SET sr.u2 = sbu.variable_value
+WHERE sr.variable_name = sbu.variable_name
+AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbu.user IN ('user2');
+
+# User3
+UPDATE test.status_results sr, performance_schema.status_by_user sbu
+SET sr.u3 = sbu.variable_value
+WHERE sr.variable_name = sbu.variable_name
+AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbu.user IN ('user3');
+
+# Status totals for 3 users.
+UPDATE test.status_results sr
+SET sr.user = sr.u1 + sr.u2 + sr.u3;
+#===========================
+# Status by host (localhost)
+#===========================
+
+# host1 = localhost
+UPDATE test.status_results sr, performance_schema.status_by_host sbh
+SET sr.h1 = sbh.variable_value
+WHERE sr.variable_name = sbh.variable_name
+AND sbh.variable_name IN ('handler_delete', 'handler_rollback')
+AND sbh.host IN ('localhost');
+
+# Status totals for 'localhost' only.
+UPDATE test.status_results sr
+SET sr.host = sr.h1 + sr.h2 + sr.h3;
+#==================
+# Status by account
+#==================
+# User1@localhost
+UPDATE test.status_results sr, performance_schema.status_by_account sba
+SET sr.a1 = sba.variable_value
+WHERE sr.variable_name = sba.variable_name
+AND sba.variable_name IN ('handler_delete', 'handler_rollback')
+AND sba.user IN ('user1');
+
+# User2@localhost
+UPDATE test.status_results sr, performance_schema.status_by_account sba
+SET sr.a2 = sba.variable_value
+WHERE sr.variable_name = sba.variable_name
+AND sba.variable_name IN ('handler_delete', 'handler_rollback')
+AND sba.user IN ('user2');
+
+# User3@localhost
+UPDATE test.status_results sr, performance_schema.status_by_account sba
+SET sr.a3 = sba.variable_value
+WHERE sr.variable_name = sba.variable_name
+AND sba.variable_name IN ('handler_delete', 'handler_rollback')
+AND sba.user IN ('user3');
+
+
+# Status totals for 3 accounts.
+UPDATE test.status_results sr
+SET sr.acct = sr.a1 + sr.a2 + sr.a3;
+USE performance_schema;
+
+================================================================================
+TEST X: STATUS_BY_THREAD: Connections are gone--nothing to verify.
+================================================================================
+
+================================================================================
+TEST 5: STATUS_BY_USER: Verify expected status counts per user (1,2,3)
+================================================================================
+SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete');
+USER	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user1	Handler_delete	1	OK
+
+SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete');
+USER	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user2	Handler_delete	2	OK
+
+SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete');
+USER	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user3	Handler_delete	3	OK
+#
+# STATUS_BY_USER vs. GLOBAL_STATUS
+#
+SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+variable_name	u1	u2	u3	delta	user	Expected
+Handler_delete	1	2	3	6	6	OK
+Handler_rollback	1	2	3	6	6	OK
+
+================================================================================
+TEST 6: STATUS_BY_ACCOUNT: Verify expected status counts per user:host (1,2,3)
+================================================================================
+SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete');
+USER	HOST	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user1	localhost	Handler_delete	1	OK
+
+SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete');
+USER	HOST	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user2	localhost	Handler_delete	2	OK
+
+SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete');
+USER	HOST	VARIABLE_NAME	VARIABLE_VALUE	Expected
+user3	localhost	Handler_delete	3	OK
+#
+# STATUS_BY_ACCOUNT vs. GLOBAL_STATUS
+#
+SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+variable_name	a1	a2	a3	delta	acct	Expected
+Handler_delete	1	2	3	6	6	OK
+Handler_rollback	1	2	3	6	6	OK
+================================================================================
+TEST 7: STATUS_BY_HOST: Verify expected status counts per host (6)
+================================================================================
+SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
+HOST	VARIABLE_NAME	VARIABLE_VALUE	Expected
+localhost	Handler_delete	6	OK
+#
+# STATUS_BY_HOST vs. GLOBAL_STATUS
+#
+# Special case: No way to isolate pre-existing 'localhost' activity, so
+# just check global totals = sum(status_by_host).
+#
+SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+variable_name	h1	h2	h3	delta	host	Expected
+Handler_delete	6	0	0	6	6	OK
+Handler_rollback	6	0	0	6	6	OK
+================================================================================
+TEST 8: FLUSH STATUS should clear account, host and user status
+================================================================================
+
+FLUSH STATUS;
+
+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
+user3	localhost	Handler_delete	0
+
+SELECT * FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
+HOST	VARIABLE_NAME	VARIABLE_VALUE
+localhost	Handler_delete	0
+
+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
+user3	Handler_delete	0
+================================================================================
+CLEANUP
+================================================================================
+DROP TABLE test.t1;
+DROP TABLE test.t2;
+DROP TABLE test.t3;
+DROP TABLE test.status_results;
+DROP USER 'user1'@localhost;
+DROP USER 'user2'@localhost;
+DROP USER 'user3'@localhost;
+
diff --git a/mysql-test/suite/perfschema/r/show_coverage.result b/mysql-test/suite/perfschema/r/show_coverage.result
new file mode 100644
index 00000000000..933554d81a3
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/show_coverage.result
@@ -0,0 +1,142 @@
+
+# TEST 1
+# Handling of SHOW STATUS/VARIABLES ... WHERE
+#
+SHOW STATUS WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW GLOBAL STATUS WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW SESSION STATUS WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW GLOBAL VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+# TEST 2
+# CREATE..SELECT -- Expect correct ER_WARN_DEPRECATED_SYNTAX
+#
+USE test;
+CREATE TABLE t0 SELECT * FROM information_schema.global_status WHERE variable_name = 'COM_SELECT';
+DROP TABLE t0;
+
+# TEST 3
+# Select status and system variable tables using ORDER BY to exercise the
+# rnd_pos() method
+#
+use performance_schema;
+select * from global_variables order by variable_name;
+select * from variables_by_thread order by variable_name;
+select * from session_variables order by variable_name;
+select * from global_status order by variable_name;
+select * from session_status order by variable_name;
+select * from status_by_thread order by variable_name;
+select * from status_by_user order by variable_name;
+select * from status_by_host order by variable_name;
+select * from status_by_account order by variable_name;
+
+# TEST 4
+# Handling of SHOW STATUS/VARIABLES ... WHERE
+#
+SHOW STATUS WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW GLOBAL STATUS WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW SESSION STATUS WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW GLOBAL VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+# TEST 5
+# Confirm FLUSH STATUS resets counters for all threads.
+#
+
+# Create a new connection
+connect con1, localhost, root,,;
+
+# Record thread id
+
+# Increase bytes_received for new connection
+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;
+
+# 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
+NULL
+
+# Expect bytes_after is zero
+SELECT @bytes_after AS 'Expect 0';
+Expect 0
+NULL
+disconnect con1;
+
+# TEST 6
+#
+# Bug#28291258 FLUSH STATUS ADDS TWICE TO GLOBAL VALUES
+#
+
+# 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
+
+SET long_query_time = 2;
+SELECT SLEEP(4);
+SLEEP(4)
+0
+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]
+
+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]
diff --git a/mysql-test/suite/perfschema/r/show_misc.result b/mysql-test/suite/perfschema/r/show_misc.result
new file mode 100644
index 00000000000..6b5baaaf498
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/show_misc.result
@@ -0,0 +1,74 @@
+select 1;
+1
+1
+SHOW STATUS LIKE 'Last_query_partial_plans';
+Variable_name	Value
+select 2;
+2
+2
+SHOW STATUS LIKE 'Last_query_cost';
+Variable_name	Value
+Last_query_cost	0.000000
+flush status;
+SHOW STATUS LIKE 'Created_tmp_tables';
+Variable_name	Value
+Created_tmp_tables	0
+
+================================================================================
+Bug#21789221 SHOW STATUS FAILS WITH LOCK TABLES AND SHOW_COMPATIBILITY_56=OFF
+================================================================================
+Verify that SHOW STATUS and SHOW VARIABLES works under LOCK TABLES mode
+
+CREATE TABLE test.t1 (s1 INT);
+LOCK TABLE test.t1 READ;
+
+SHOW GLOBAL STATUS WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW SESSION STATUS WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW GLOBAL VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+UNLOCK TABLES;
+
+LOCK TABLE test.t1 WRITE;
+
+SHOW GLOBAL STATUS WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW SESSION STATUS WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW GLOBAL VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+Variable_name	Value
+
+UNLOCK TABLES;
+DROP TABLE test.t1;
+
+================================================================================
+Bug#28515475 BOGUS DATA WHEN ORDERING RESULTS FROM VARIABLES_BY_THREAD 
+================================================================================
+Verify the results from "WHERE variable_name IN(...)", particularly for those
+variables that are listed after the deprecated variable gtid_executed.
+The ORDER BY also forces an additional code path through rnd_pos().
+
+SELECT variable_name FROM performance_schema.variables_by_thread
+WHERE variable_name IN ('interactive_timeout','net_read_timeout','net_write_timeout','wait_timeout')
+ORDER BY variable_name;
+variable_name
+interactive_timeout
+net_read_timeout
+net_write_timeout
+wait_timeout
+
+================================================================================
+CLEAN UP
+================================================================================
diff --git a/mysql-test/suite/perfschema/r/show_plugin.result b/mysql-test/suite/perfschema/r/show_plugin.result
new file mode 100644
index 00000000000..172cea22574
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/show_plugin.result
@@ -0,0 +1,626 @@
+
+================================================================================
+SETUP
+================================================================================
+# Save the initial number of concurrent sessions
+
+# 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 performance_schema.global_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_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';
+
+================================================================================
+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, 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, 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
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+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
+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, 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, 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
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+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
+
+================================================================================
+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 performance_schema.global_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_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';
+
+================================================================================
+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, 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, 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
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+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
+
+================================================================================
+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 performance_schema.global_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_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';
+
+================================================================================
+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, 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, 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
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+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
+
+# 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.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, 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, 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
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+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
+
+# 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.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, 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, 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
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+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
+
+# 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.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 performance_schema.global_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_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 performance_schema.global_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
+variable_name	variable_value
+
+SELECT variable_name, variable_value FROM performance_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
+================================================================================
+
+
+================================================================================
+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 @@session.innodb_strict_mode;
+@@session.innodb_strict_mode
+1
+select user(), current_user();
+user()	current_user()
+root@localhost	root@localhost
+change_user root
+#
+# Trigger a resync of session variables with global variables.
+#
+set @@session.innodb_strict_mode=off;
+
+# Restore
+
+set @@session.innodb_strict_mode=1;
+select @@session.innodb_strict_mode;
+@@session.innodb_strict_mode
+1
+
+================================================================================
+CLEAN UP
+================================================================================
+connection default;
+
+
+
+# Wait till we reached the initial number of concurrent sessions
diff --git a/mysql-test/suite/perfschema/r/show_sanity.result b/mysql-test/suite/perfschema/r/show_sanity.result
new file mode 100644
index 00000000000..71bc92a2c2f
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/show_sanity.result
@@ -0,0 +1,853 @@
+create table test.sanity(
+`SHOW_MODE` varchar(48) NOT NULL,
+`SOURCE` varchar(64) NOT NULL,
+`VARIABLE_NAME` varchar(64) NOT NULL);
+select thread_id from performance_schema.threads
+where processlist_id = connection_id()
+into @my_tid;
+select @@global.show_compatibility_56 into @show_compatibility_56_save;
+set @my_user='root';
+set @my_host='localhost';
+
+================================================================================
+SHOW_COMPATIBILITY_56 = ON
+================================================================================
+set global show_compatibility_56 = on;
+
+# STEP 1-1
+insert into test.sanity
+select "5.6", "I_S.GLOBAL_VARIABLES", variable_name
+from information_schema.global_variables;
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.GLOBAL_VARIABLES' is deprecated and will be removed in a future release. Please use performance_schema.global_variables instead
+
+# STEP 1-2
+insert into test.sanity
+select "5.6", "I_S.SESSION_VARIABLES", variable_name
+from information_schema.session_variables;
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.SESSION_VARIABLES' is deprecated and will be removed in a future release. Please use performance_schema.session_variables instead
+
+# STEP 1-3
+insert into test.sanity
+select "5.6", "P_S.GLOBAL_VARIABLES", variable_name
+from performance_schema.global_variables;
+
+# STEP 1-4
+insert into test.sanity
+select "5.6", "P_S.VARIABLES_BY_THREAD", variable_name
+from performance_schema.variables_by_thread
+where thread_id = @my_tid;
+
+# STEP 1-5
+insert into test.sanity
+select "5.6", "P_S.SESSION_VARIABLES", variable_name
+from performance_schema.session_variables;
+
+# STEP 1-6
+insert into test.sanity
+select "5.6", "I_S.GLOBAL_STATUS", variable_name
+from information_schema.global_status;
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
+
+# STEP 1-7
+insert into test.sanity
+select "5.6", "I_S.SESSION_STATUS", variable_name
+from information_schema.session_status;
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.SESSION_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.session_status instead
+
+# STEP 1-8
+insert into test.sanity
+select "5.6", "P_S.GLOBAL_STATUS", variable_name
+from performance_schema.global_status;
+
+# STEP 1-9
+# EMPTY, NO WARNINGS (not available in 5.6 mode)
+select *
+from performance_schema.status_by_thread;
+THREAD_ID	VARIABLE_NAME	VARIABLE_VALUE
+
+# STEP 1-10
+insert into test.sanity
+select "5.6", "P_S.SESSION_STATUS", variable_name
+from performance_schema.session_status;
+
+# STEP 1-11
+# EMPTY, NO WARNINGS (not available in 5.6 mode)
+select *
+from performance_schema.status_by_account;
+USER	HOST	VARIABLE_NAME	VARIABLE_VALUE
+
+# STEP 1-12
+# EMPTY, NO WARNINGS (not available in 5.6 mode)
+select *
+from performance_schema.status_by_user;
+USER	VARIABLE_NAME	VARIABLE_VALUE
+
+# STEP 1-13
+# EMPTY, NO WARNINGS (not available in 5.6 mode)
+select *
+from performance_schema.status_by_host;
+HOST	VARIABLE_NAME	VARIABLE_VALUE
+
+================================================================================
+SHOW_COMPATIBILITY_56 = OFF
+================================================================================
+set global show_compatibility_56 = off;
+
+# STEP 2-1
+# FAILS WITH ERROR
+select *
+from information_schema.global_variables;
+ERROR HY000: The 'INFORMATION_SCHEMA.GLOBAL_VARIABLES' feature is disabled; see the documentation for 'show_compatibility_56'
+
+# STEP 2-2
+# FAILS WITH ERROR
+select *
+from information_schema.session_variables;
+ERROR HY000: The 'INFORMATION_SCHEMA.SESSION_VARIABLES' feature is disabled; see the documentation for 'show_compatibility_56'
+
+# STEP 2-3
+insert into test.sanity
+select "5.7", "P_S.GLOBAL_VARIABLES", variable_name
+from performance_schema.global_variables;
+
+# STEP 2-4
+insert into test.sanity
+select "5.7", "P_S.VARIABLES_BY_THREAD", variable_name
+from performance_schema.variables_by_thread
+where thread_id = @my_tid;
+
+# STEP 2-5
+insert into test.sanity
+select "5.7", "P_S.SESSION_VARIABLES", variable_name
+from performance_schema.session_variables;
+
+# STEP 2-6
+# FAILS WITH ERROR
+select *
+from information_schema.global_status;
+ERROR HY000: The 'INFORMATION_SCHEMA.GLOBAL_STATUS' feature is disabled; see the documentation for 'show_compatibility_56'
+
+# STEP 2-7
+# FAILS WITH ERROR
+select *
+from information_schema.session_status;
+ERROR HY000: The 'INFORMATION_SCHEMA.SESSION_STATUS' feature is disabled; see the documentation for 'show_compatibility_56'
+
+# STEP 2-8
+insert into test.sanity
+select "5.7", "P_S.GLOBAL_STATUS", variable_name
+from performance_schema.global_status;
+
+# STEP 2-9
+insert into test.sanity
+select "5.7", "P_S.STATUS_BY_THREAD", variable_name
+from performance_schema.status_by_thread
+where thread_id = @my_tid;
+
+# STEP 2-10
+insert into test.sanity
+select "5.7", "P_S.SESSION_STATUS", variable_name
+from performance_schema.session_status;
+
+# STEP 2-11
+insert into test.sanity
+select "5.7", "P_S.STATUS_BY_ACCOUNT", variable_name
+from performance_schema.status_by_account
+where `user` = @my_user and `host` = @my_host;
+
+# STEP 2-12
+insert into test.sanity
+select "5.7", "P_S.STATUS_BY_USER", variable_name
+from performance_schema.status_by_user
+where `user` = @my_user;
+
+# STEP 2-13
+insert into test.sanity
+select "5.7", "P_S.STATUS_BY_HOST", variable_name
+from performance_schema.status_by_host
+where `host` = @my_host;
+
+# STEP 2-14
+# Known global variables in 5.6 that should not display in session queries.
+# These should be global-only system variables.
+
+# STEP 2-15
+# Known global status in 5.6 that should not exist in session queries.
+# These should be global-only status variables.
+
+# STEP 2-15A
+# COM counters appear in I_S.SESSION_STATUS, but not in P_S.SESSION_STATUS
+
+# STEP 2-15B
+# These slave status counters appear in I_S.SESSION_STATUS, but not in P_S.SESSION_STATUS
+insert into test.sanity values
+("JUNK: SLAVE-ONLY", "I_S.SESSION_STATUS", "SLAVE_HEARTBEAT_PERIOD"),
+("JUNK: SLAVE-ONLY", "I_S.SESSION_STATUS", "SLAVE_LAST_HEARTBEAT"),
+("JUNK: SLAVE-ONLY", "I_S.SESSION_STATUS", "SLAVE_RECEIVED_HEARTBEATS"),
+("JUNK: SLAVE-ONLY", "I_S.SESSION_STATUS", "SLAVE_RETRIED_TRANSACTIONS"),
+("JUNK: SLAVE-ONLY", "I_S.SESSION_STATUS", "SLAVE_RUNNING")
+;
+
+# STEP 2-16
+# Known session-only status in 5.6 that should not exist in global queries.
+insert into test.sanity values
+("JUNK: SESSION-ONLY", "I_S.GLOBAL_STATUS", "COMPRESSION"),
+("JUNK: SESSION-ONLY", "I_S.GLOBAL_STATUS", "LAST_QUERY_COST"),
+("JUNK: SESSION-ONLY", "I_S.GLOBAL_STATUS", "LAST_QUERY_PARTIAL_PLANS")
+;
+
+# STEP 2-16A
+# COM counters appear in I_S.GLOBAL_STATUS but not in P_S.GLOBAL_STATUS
+
+# STEP 2-16B
+# These slave status counters appear in I_S.GLOBAL_STATUS, but not in P_S.GLOBAL_STATUS
+insert into test.sanity values
+("JUNK: SLAVE-ONLY", "I_S.GLOBAL_STATUS", "SLAVE_HEARTBEAT_PERIOD"),
+("JUNK: SLAVE-ONLY", "I_S.GLOBAL_STATUS", "SLAVE_LAST_HEARTBEAT"),
+("JUNK: SLAVE-ONLY", "I_S.GLOBAL_STATUS", "SLAVE_RECEIVED_HEARTBEATS"),
+("JUNK: SLAVE-ONLY", "I_S.GLOBAL_STATUS", "SLAVE_RETRIED_TRANSACTIONS"),
+("JUNK: SLAVE-ONLY", "I_S.GLOBAL_STATUS", "SLAVE_RUNNING")
+;
+
+# STEP 2-17
+# Status variables that should not exist in queries that aggregate across threads.
+# Criteria: Session-only OR non-aggregatable.
+insert into test.sanity values
+("JUNK", "NO AGGREGATE", "COMPRESSION"),
+("JUNK", "NO AGGREGATE", "LAST_QUERY_COST"),
+("JUNK", "NO AGGREGATE", "LAST_QUERY_PARTIAL_PLANS"),
+("JUNK", "NO AGGREGATE", "OPEN_TABLES"),
+("JUNK", "NO AGGREGATE", "QUERIES"),
+("JUNK", "NO AGGREGATE", "SLOW_LAUNCH_THREADS"),
+("JUNK", "NO AGGREGATE", "SSL_CIPHER"),
+("JUNK", "NO AGGREGATE", "SSL_CIPHER_LIST"),
+("JUNK", "NO AGGREGATE", "SSL_DEFAULT_TIMEOUT"),
+("JUNK", "NO AGGREGATE", "SSL_SERVER_NOT_AFTER"),
+("JUNK", "NO AGGREGATE", "SSL_SERVER_NOT_BEFORE"),
+("JUNK", "NO AGGREGATE", "SSL_SESSIONS_REUSED"),
+("JUNK", "NO AGGREGATE", "SSL_VERIFY_DEPTH"),
+("JUNK", "NO AGGREGATE", "SSL_VERIFY_MODE"),
+("JUNK", "NO AGGREGATE", "SSL_VERSION")
+;
+
+================================================================================
+TEST 1A
+Present in 5.6 P_S.GLOBAL_VARIABLES (1-3)
+Missing in 5.6 I_S.GLOBAL_VARIABLES (1-1)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "P_S.GLOBAL_VARIABLES"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "I_S.GLOBAL_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 1B
+Present in 5.7 P_S.GLOBAL_VARIABLES (2-3)
+Missing in 5.6 I_S.GLOBAL_VARIABLES (1-1)
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.GLOBAL_VARIABLES"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "I_S.GLOBAL_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 2A
+Present in 5.6 I_S.GLOBAL_VARIABLES (1-1)
+Missing in 5.6 P_S.GLOBAL_VARIABLES (1-3)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "I_S.GLOBAL_VARIABLES"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "P_S.GLOBAL_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+5.6	I_S.GLOBAL_VARIABLES	SQL_LOG_BIN
+
+================================================================================
+TEST 2B
+Present in 5.6 I_S.GLOBAL_VARIABLES (1-1)
+Missing in 5.7 P_S.GLOBAL_VARIABLES (2-3)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "I_S.GLOBAL_VARIABLES"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.GLOBAL_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+5.6	I_S.GLOBAL_VARIABLES	SQL_LOG_BIN
+
+================================================================================
+TEST 3A
+Present in 5.6 P_S.SESSION_VARIABLES (1-5)
+Missing in 5.6 I_S.SESSION_VARIABLES (1-2)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "P_S.SESSION_VARIABLES"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "I_S.SESSION_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 3B
+Present in 5.7 P_S.SESSION_VARIABLES (2-5)
+Missing in 5.6 I_S.SESSION_VARIABLES (1-2)
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.SESSION_VARIABLES"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "I_S.SESSION_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 4A
+Present in 5.6 I_S.SESSION_VARIABLES (1-2)
+Missing in 5.6 P_S.SESSION_VARIABLES (1-5)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "I_S.SESSION_VARIABLES"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "P_S.SESSION_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+5.6	I_S.SESSION_VARIABLES	GTID_EXECUTED
+
+================================================================================
+TEST 4B
+Present in 5.6 I_S.SESSION_VARIABLES (1-2)
+Missing in 5.7 P_S.SESSION_VARIABLES (2-5)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "I_S.SESSION_VARIABLES"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.SESSION_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+5.6	I_S.SESSION_VARIABLES	GTID_EXECUTED
+
+================================================================================
+TEST 5A
+Present in 5.6 P_S.VARIABLES_BY_THREAD (1-4)
+Missing in 5.6 I_S.SESSION_VARIABLES (1-2)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "P_S.VARIABLES_BY_THREAD"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "I_S.SESSION_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 5B
+Present in 5.7 P_S.VARIABLES_BY_THREAD (2-4)
+Missing in 5.6 I_S.SESSION_VARIABLES (1-2)
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.VARIABLES_BY_THREAD"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "I_S.SESSION_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 5C
+Present in 5.6 I_S.SESSION_VARIABLES (1-2)
+Missing in 5.6 P_S.VARIABLES_BY_THREAD (1-4)
+EXPECT NOTHING BESIDE KNOWN GLOBAL VARIABLES (2-14)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "I_S.SESSION_VARIABLES"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "P_S.VARIABLES_BY_THREAD")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "JUNK: GLOBAL-ONLY"
+    and source = "I_S.SESSION_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+5.6	I_S.SESSION_VARIABLES	BINLOG_TRANSACTION_DEPENDENCY_HISTORY_SIZE
+5.6	I_S.SESSION_VARIABLES	BINLOG_TRANSACTION_DEPENDENCY_TRACKING
+5.6	I_S.SESSION_VARIABLES	GTID_EXECUTED
+5.6	I_S.SESSION_VARIABLES	INNODB_DEADLOCK_DETECT
+5.6	I_S.SESSION_VARIABLES	INNODB_STATS_INCLUDE_DELETE_MARKED
+5.6	I_S.SESSION_VARIABLES	KEYRING_OPERATIONS
+5.6	I_S.SESSION_VARIABLES	LOG_STATEMENTS_UNSAFE_FOR_BINLOG
+5.6	I_S.SESSION_VARIABLES	TLS_VERSION
+
+================================================================================
+TEST 5D
+Present in 5.6 I_S.SESSION_VARIABLES (1-2)
+Missing in 5.7 P_S.VARIABLES_BY_THREAD (2-5)
+EXPECT NOTHING BESIDE KNOWN GLOBAL VARIABLES (2-14)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "I_S.SESSION_VARIABLES"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.VARIABLES_BY_THREAD")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "JUNK: GLOBAL-ONLY"
+    and source = "I_S.SESSION_VARIABLES")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+5.6	I_S.SESSION_VARIABLES	BINLOG_TRANSACTION_DEPENDENCY_HISTORY_SIZE
+5.6	I_S.SESSION_VARIABLES	BINLOG_TRANSACTION_DEPENDENCY_TRACKING
+5.6	I_S.SESSION_VARIABLES	GTID_EXECUTED
+5.6	I_S.SESSION_VARIABLES	INNODB_DEADLOCK_DETECT
+5.6	I_S.SESSION_VARIABLES	INNODB_STATS_INCLUDE_DELETE_MARKED
+5.6	I_S.SESSION_VARIABLES	KEYRING_OPERATIONS
+5.6	I_S.SESSION_VARIABLES	LOG_STATEMENTS_UNSAFE_FOR_BINLOG
+5.6	I_S.SESSION_VARIABLES	TLS_VERSION
+
+================================================================================
+TEST 5E
+KNOWN GLOBAL VARIABLES (2-14)
+Expect missing in 5.6 P_S.VARIABLES_BY_THREAD (1-4)
+================================================================================
+select * from test.sanity
+where show_mode = "JUNK: GLOBAL-ONLY"
+  and source = "I_S.SESSION_VARIABLES"
+  and upper(variable_name) in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "P_S.VARIABLES_BY_THREAD")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 5F
+KNOWN GLOBAL VARIABLES (2-14)
+Expect missing in 5.7 P_S.VARIABLES_BY_THREAD (2-5)
+================================================================================
+select * from test.sanity
+where show_mode = "JUNK: GLOBAL-ONLY"
+  and source = "I_S.SESSION_VARIABLES"
+  and upper(variable_name) in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.VARIABLES_BY_THREAD")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 6A
+Present in 5.7 P_S.GLOBAL_STATUS (2-8)
+Missing in 5.6 I_S.GLOBAL_STATUS (1-6)
+EXPECT NOTHING
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.GLOBAL_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "I_S.GLOBAL_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 6B
+Present in 5.7 P_S.GLOBAL_STATUS (2-8)
+Missing in 5.6 P_S.GLOBAL_STATUS (1-8)
+EXPECT NOTHING
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.GLOBAL_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "P_S.GLOBAL_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 6C
+Present in 5.6 P_S.GLOBAL_STATUS (1-8)
+Missing in 5.7 P_S.GLOBAL_STATUS (2-8)
+EXPECT NOTHING
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "P_S.GLOBAL_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.GLOBAL_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 7
+Present in 5.6 I_S.GLOBAL_STATUS (1-6)
+Missing in 5.7 P_S.GLOBAL_STATUS (2-8)
+EXPECT NOTHING AFTER REMOVING KNOWN SESSION-ONLY, COM COUNTERS AND SLAVE-ONLY (2-16 & 2-16A & 2-16B)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "I_S.GLOBAL_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where (show_mode = "JUNK: SESSION-ONLY" or show_mode = "JUNK: COM COUNTER" or show_mode = "JUNK: SLAVE-ONLY")
+and source = "I_S.GLOBAL_STATUS")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.GLOBAL_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+5.6	I_S.GLOBAL_STATUS	COM_SHUTDOWN
+
+================================================================================
+TEST 8
+KNOWN SESSION-ONLY (2-16)
+KNOWN COM COUNTERS (2-16A)
+KNOWN SLAVE-ONLY (2-16B)
+Status variables that should NOT be present in 5.7 P_S.GLOBAL_STATUS (2-8)
+EXPECT NOTHING
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.GLOBAL_STATUS"
+  and upper(variable_name) in (
+select upper(variable_name) from test.sanity
+where (show_mode = "JUNK: SESSION-ONLY" or show_mode = "JUNK: COM COUNTER" or show_mode = "JUNK: SLAVE-ONLY")
+and source = "I_S.GLOBAL_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 9A
+Present in 5.7 P_S.SESSION_STATUS (2-10)
+Missing in 5.6 I_S.SESSION_STATUS (1-7)
+EXPECT NOTHING
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.SESSION_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "I_S.SESSION_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 9B
+Present in 5.7 P_S.SESSION_STATUS (2-10)
+Missing in 5.6 P_S.SESSION_STATUS (1-10)
+EXPECT NOTHING
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.SESSION_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.6"
+    and source = "P_S.SESSION_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 9C
+Present in 5.6 P_S.SESSION_STATUS (1-10)
+Missing in 5.7 P_S.SESSION_STATUS (2-10)
+EXPECT NOTHING
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "P_S.SESSION_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.SESSION_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 10
+Present in 5.6 I_S.SESSION_STATUS (1-7)
+Missing in 5.7 P_S.SESSION_STATUS (2-10)
+EXPECT NOTHING AFTER REMOVING KNOWN COM COUNTERS AND SLAVE-ONLY (2-15A & 2-15B)
+================================================================================
+select * from test.sanity
+where show_mode = "5.6"
+  and source = "I_S.SESSION_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where (show_mode = "JUNK: COM COUNTER" or show_mode = "JUNK: SLAVE-ONLY")
+and source = "I_S.SESSION_STATUS")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.SESSION_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+5.6	I_S.SESSION_STATUS	COM_SHUTDOWN
+
+================================================================================
+TEST 11
+KNOWN COM COUNTERS (2-15A)
+KNOWN SLAVE-ONLY (2-15B)
+Status variables that should NOT be present in 5.7 P_S.SESSION_STATUS (2-10)
+EXPECT NOTHING
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.SESSION_STATUS"
+  and upper(variable_name) in (
+select upper(variable_name) from test.sanity
+where (show_mode = "JUNK: COM COUNTER" or show_mode = "JUNK: SLAVE-ONLY")
+and source = "I_S.SESSION_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 12
+Present in 5.7 P_S.SESSION_STATUS (2-10)
+Missing in 5.7 P_S.STATUS_BY_THREAD
+EXPECT NOTHING AFTER REMOVING KNOWN GLOBAL-ONLY (2-15)
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.SESSION_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.STATUS_BY_THREAD")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where (show_mode = "JUNK: GLOBAL-ONLY")
+and source = "I_S.SESSION_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 13
+Present in 5.7 P_S.STATUS_BY_THREAD
+Missing in 5.7 P_S.SESSION_STATUS (2-10)
+EXPECT NOTHING
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.STATUS_BY_THREAD"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.SESSION_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 14
+Present in 5.7 P_S.SESSION_STATUS (2-10)
+Missing in 5.7 P_S.STATUS_BY_ACCOUNT
+EXPECT NOTHING AFTER REMOVING
+- KNOWN GLOBAL-ONLY (2-15)
+- STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.SESSION_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "JUNK"
+    and source = "NO AGGREGATE")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where (show_mode = "JUNK: GLOBAL-ONLY")
+and source = "I_S.SESSION_STATUS")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.STATUS_BY_ACCOUNT")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 15
+Present in 5.7 P_S.STATUS_BY_ACCOUNT
+Missing in 5.7 P_S.SESSION_STATUS (2-10)
+EXPECT NOTHING
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.STATUS_BY_ACCOUNT"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.SESSION_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 16
+KNOWN STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+Status variables that should NOT be present in 5.7 P_S.STATUS_BY_ACCOUNT
+================================================================================
+select * from performance_schema.status_by_account
+where upper(variable_name) in (
+select upper(variable_name) from test.sanity
+where show_mode = "JUNK"
+    and source = "NO AGGREGATE")
+order by variable_name;
+USER	HOST	VARIABLE_NAME	VARIABLE_VALUE
+
+================================================================================
+TEST 17
+Present in 5.7 P_S.SESSION_STATUS (2-10)
+Missing in 5.7 P_S.STATUS_BY_USER
+EXPECT NOTHING AFTER REMOVING
+- KNOWN GLOBAL-ONLY (2-15)
+- STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.SESSION_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "JUNK"
+    and source = "NO AGGREGATE")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where (show_mode = "JUNK: GLOBAL-ONLY")
+and source = "I_S.SESSION_STATUS")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.STATUS_BY_USER")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 18
+Present in 5.7 P_S.STATUS_BY_USER
+Missing in 5.7 P_S.SESSION_STATUS (2-10)
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.STATUS_BY_USER"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.SESSION_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 19
+KNOWN STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+Status variables that should NOT be present in 5.7 P_S.STATUS_BY_USER
+================================================================================
+select * from performance_schema.status_by_user
+where upper(variable_name) in (
+select upper(variable_name) from test.sanity
+where show_mode = "JUNK"
+    and source = "NO AGGREGATE")
+order by variable_name;
+USER	VARIABLE_NAME	VARIABLE_VALUE
+
+================================================================================
+TEST 20
+Present in 5.7 P_S.SESSION_STATUS (2-10)
+Missing in 5.7 P_S.STATUS_BY_HOST
+EXPECT NOTHING AFTER REMOVING
+- KNOWN GLOBAL-ONLY (2-15)
+- STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.SESSION_STATUS"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "JUNK"
+    and source = "NO AGGREGATE")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where (show_mode = "JUNK: GLOBAL-ONLY")
+and source = "I_S.SESSION_STATUS")
+and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.STATUS_BY_HOST")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 21
+Present in 5.7 P_S.STATUS_BY_HOST
+Missing in 5.7 P_S.SESSION_STATUS (2-10)
+================================================================================
+select * from test.sanity
+where show_mode = "5.7"
+  and source = "P_S.STATUS_BY_HOST"
+  and upper(variable_name) not in (
+select upper(variable_name) from test.sanity
+where show_mode = "5.7"
+    and source = "P_S.SESSION_STATUS")
+order by show_mode, source, variable_name;
+SHOW_MODE	SOURCE	VARIABLE_NAME
+
+================================================================================
+TEST 22
+KNOWN STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+Status variables that should NOT be present in 5.7 P_S.STATUS_BY_HOST
+================================================================================
+select * from performance_schema.status_by_host
+where upper(variable_name) in (
+select upper(variable_name) from test.sanity
+where show_mode = "JUNK"
+    and source = "NO AGGREGATE")
+order by variable_name;
+HOST	VARIABLE_NAME	VARIABLE_VALUE
+
+================================================================================
+CLEAN UP
+================================================================================
+set @@global.show_compatibility_56 = @show_compatibility_56_save;
+drop table test.sanity;
diff --git a/mysql-test/suite/perfschema/r/sizing_default.result b/mysql-test/suite/perfschema/r/sizing_default.result
deleted file mode 100644
index 07fbf35619b..00000000000
--- a/mysql-test/suite/perfschema/r/sizing_default.result
+++ /dev/null
@@ -1,69 +0,0 @@
-show variables like "table_definition_cache";
-Variable_name	Value
-table_definition_cache	1400
-show variables like "table_open_cache";
-Variable_name	Value
-table_open_cache	2000
-show variables like "max_connections";
-Variable_name	Value
-max_connections	151
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	10000
-performance_schema_events_stages_history_long_size	10000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	3504
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	7693
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	15906
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	9102
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	322
-performance_schema_max_stage_classes\t160
-performance_schema_max_table_handles	4000
-performance_schema_max_table_instances	12500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	402
-performance_schema_session_connect_attrs_size	512
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "%performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
diff --git a/mysql-test/suite/perfschema/r/sizing_growth.result b/mysql-test/suite/perfschema/r/sizing_growth.result
deleted file mode 100644
index 2190e904fd4..00000000000
--- a/mysql-test/suite/perfschema/r/sizing_growth.result
+++ /dev/null
@@ -1,255 +0,0 @@
-flush status;
-flush tables;
-select * from performance_schema.mutex_instances;
-select * from performance_schema.rwlock_instances;
-select * from performance_schema.cond_instances;
-select * from performance_schema.file_instances;
-select count(*) from performance_schema.mutex_instances
-into @v0_mutex_instances;
-select count(*) from performance_schema.rwlock_instances
-into @v0_rwlock_instances;
-select count(*) from performance_schema.cond_instances
-into @v0_cond_instances;
-select count(*) from performance_schema.file_instances
-into @v0_file_instances;
-select count(*) from performance_schema.mutex_instances
-into @v1_mutex_instances;
-select count(*) from performance_schema.rwlock_instances
-into @v1_rwlock_instances;
-select count(*) from performance_schema.cond_instances
-into @v1_cond_instances;
-select count(*) from performance_schema.file_instances
-into @v1_file_instances;
-select count(name), name from performance_schema.mutex_instances
-group by name;
-select count(name), name from performance_schema.rwlock_instances
-group by name;
-select count(name), name from performance_schema.cond_instances
-group by name;
-select count(event_name), event_name from performance_schema.file_instances
-group by event_name;
-begin;
-create table test.t1(a int) engine = innodb;
-create table test.t2(a int) engine = innodb;
-create table test.t3(a int) engine = innodb;
-create table test.t4(a int) engine = innodb;
-create table test.t5(a int) engine = innodb;
-create table test.t6(a int) engine = innodb;
-create table test.t7(a int) engine = innodb;
-create table test.t8(a int) engine = innodb;
-create table test.t9(a int) engine = innodb;
-create table test.t10(a int) engine = innodb;
-select * from test.t1;
-select * from test.t2;
-select * from test.t3;
-select * from test.t4;
-select * from test.t5;
-select * from test.t6;
-select * from test.t7;
-select * from test.t8;
-select * from test.t9;
-select * from test.t10;
-commit;
-select count(*) from performance_schema.mutex_instances
-into @v2_mutex_instances;
-select count(*) from performance_schema.rwlock_instances
-into @v2_rwlock_instances;
-select count(*) from performance_schema.cond_instances
-into @v2_cond_instances;
-select count(*) from performance_schema.file_instances
-into @v2_file_instances;
-select count(name), name from performance_schema.mutex_instances
-group by name;
-select count(name), name from performance_schema.rwlock_instances
-group by name;
-select count(name), name from performance_schema.cond_instances
-group by name;
-select count(event_name), event_name from performance_schema.file_instances
-group by event_name;
-select @v2_mutex_instances, @v1_mutex_instances, @v0_mutex_instances;
-select @v2_rwlock_instances, @v1_rwlock_instances, @v0_rwlock_instances;
-select @v2_cond_instances, @v1_cond_instances, @v0_cond_instances;
-select @v2_file_instances, @v1_file_instances, @v0_file_instances;
-select round((@v2_mutex_instances - @v1_mutex_instances) / 10)
-into @mutex_per_share;
-select round((@v2_rwlock_instances - @v1_rwlock_instances) / 10)
-into @rwlock_per_share;
-select round((@v2_cond_instances - @v1_cond_instances) / 10)
-into @cond_per_share;
-select round((@v2_file_instances - @v1_file_instances) / 10)
-into @file_per_share;
-select "con1 connected";
-select "con2 connected";
-select "con3 connected";
-select "con4 connected";
-select "con5 connected";
-select "con6 connected";
-select "con7 connected";
-select "con8 connected";
-select "con9 connected";
-select "con10 connected";
-select count(*) from performance_schema.mutex_instances
-into @v3_mutex_instances;
-select count(*) from performance_schema.rwlock_instances
-into @v3_rwlock_instances;
-select count(*) from performance_schema.cond_instances
-into @v3_cond_instances;
-select count(*) from performance_schema.file_instances
-into @v3_file_instances;
-select count(name), name from performance_schema.mutex_instances
-group by name;
-select count(name), name from performance_schema.rwlock_instances
-group by name;
-select count(name), name from performance_schema.cond_instances
-group by name;
-select count(event_name), event_name from performance_schema.file_instances
-group by event_name;
-select @v3_mutex_instances, @v2_mutex_instances;
-select @v3_rwlock_instances, @v2_rwlock_instances;
-select @v3_cond_instances, @v2_cond_instances;
-select @v3_file_instances, @v2_file_instances;
-select round((@v3_mutex_instances - @v2_mutex_instances) / 10)
-into @mutex_per_con;
-select round((@v3_rwlock_instances - @v2_rwlock_instances) / 10)
-into @rwlock_per_con;
-select round((@v3_cond_instances - @v2_cond_instances) / 10)
-into @cond_per_con;
-select round((@v3_file_instances - @v2_file_instances) / 10)
-into @file_per_con;
-lock table test.t1 write, test.t2 write, test.t3 write, test.t4 write,
-test.t5 write, test.t6 write, test.t7 write, test.t8 write, test.t9 write,
-test.t10 write;
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-select count(*) from performance_schema.mutex_instances
-into @v4_mutex_instances;
-select count(*) from performance_schema.rwlock_instances
-into @v4_rwlock_instances;
-select count(*) from performance_schema.cond_instances
-into @v4_cond_instances;
-select count(*) from performance_schema.file_instances
-into @v4_file_instances;
-select count(name), name from performance_schema.mutex_instances
-group by name;
-select count(name), name from performance_schema.rwlock_instances
-group by name;
-select count(name), name from performance_schema.cond_instances
-group by name;
-select count(event_name), event_name from performance_schema.file_instances
-group by event_name;
-select @v4_mutex_instances, @v3_mutex_instances;
-select @v4_rwlock_instances, @v3_rwlock_instances;
-select @v4_cond_instances, @v3_cond_instances;
-select @v4_file_instances, @v3_file_instances;
-select round((@v4_mutex_instances - @v3_mutex_instances) / 10)
-into @mutex_per_handle;
-select round((@v4_rwlock_instances - @v3_rwlock_instances) / 10)
-into @rwlock_per_handle;
-select round((@v4_cond_instances - @v3_cond_instances) / 10)
-into @cond_per_handle;
-select round((@v4_file_instances - @v3_file_instances) / 10)
-into @file_per_handle;
-unlock tables;
-drop table test.t1;
-drop table test.t2;
-drop table test.t3;
-drop table test.t4;
-drop table test.t5;
-drop table test.t6;
-drop table test.t7;
-drop table test.t8;
-drop table test.t9;
-drop table test.t10;
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
-select @rwlock_per_share <= 3;
-@rwlock_per_share <= 3
-1
-select @cond_per_share;
-@cond_per_share
-0
-select @file_per_share <= 3;
-@file_per_share <= 3
-1
-select @mutex_per_con;
-@mutex_per_con
-3
-select @rwlock_per_con;
-@rwlock_per_con
-1
-select @cond_per_con;
-@cond_per_con
-2
-select @file_per_con;
-@file_per_con
-0
-select @mutex_per_handle;
-@mutex_per_handle
-0
-select @rwlock_per_handle;
-@rwlock_per_handle
-0
-select @cond_per_handle;
-@cond_per_handle
-0
-select @file_per_handle;
-@file_per_handle
-0
-select if(
-(@rwlock_per_share <= 3)
-AND (@cond_per_share = 0)
-AND (@file_per_share <= 3)
-AND (@mutex_per_con = 3)
-AND (@rwlock_per_con = 1)
-AND (@cond_per_con = 2)
-AND (@file_per_con = 0)
-AND (@mutex_per_handle = 0)
-AND (@rwlock_per_handle = 0)
-AND (@cond_per_handle = 0)
-AND (@file_per_handle = 0),
-"OK: heuristics are up to date",
-"FAILED: heuristics need to be updated")
-as status;
-status
-OK: heuristics are up to date
diff --git a/mysql-test/suite/perfschema/r/sizing_high.result b/mysql-test/suite/perfschema/r/sizing_high.result
deleted file mode 100644
index 1cf84a14d22..00000000000
--- a/mysql-test/suite/perfschema/r/sizing_high.result
+++ /dev/null
@@ -1,69 +0,0 @@
-show variables like "table_definition_cache";
-Variable_name	Value
-table_definition_cache	5000
-show variables like "table_open_cache";
-Variable_name	Value
-table_open_cache	400
-show variables like "max_connections";
-Variable_name	Value
-max_connections	200
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	10000
-performance_schema_events_stages_history_long_size	10000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	10000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	10000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	10900
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	23385
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	52200
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	30800
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	420
-performance_schema_max_stage_classes\t160
-performance_schema_max_table_handles	800
-performance_schema_max_table_instances	12500
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	500
-performance_schema_session_connect_attrs_size	512
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "%performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
diff --git a/mysql-test/suite/perfschema/r/sizing_low.result b/mysql-test/suite/perfschema/r/sizing_low.result
deleted file mode 100644
index 4569ebd7a5e..00000000000
--- a/mysql-test/suite/perfschema/r/sizing_low.result
+++ /dev/null
@@ -1,70 +0,0 @@
-show variables like "table_definition_cache";
-Variable_name	Value
-table_definition_cache	400
-show variables like "table_open_cache";
-Variable_name	Value
-table_open_cache	100
-show variables like "max_connections";
-Variable_name	Value
-max_connections	50
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	10
-performance_schema_digests_size	1000
-performance_schema_events_stages_history_long_size	100
-performance_schema_events_stages_history_size	5
-performance_schema_events_statements_history_long_size	100
-performance_schema_events_statements_history_size	5
-performance_schema_events_waits_history_long_size	100
-performance_schema_events_waits_history_size	5
-performance_schema_hosts_size	20
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	612
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	1556
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	2945
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	1612
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	67
-performance_schema_max_stage_classes\t160
-performance_schema_max_table_handles	112
-performance_schema_max_table_instances	445
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	112
-performance_schema_session_connect_attrs_size	512
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	5
-show status like "%performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
-CALL mtr.add_suppression("innodb_open_files should not be greater than the open_files_limit.");
diff --git a/mysql-test/suite/perfschema/r/sizing_med.result b/mysql-test/suite/perfschema/r/sizing_med.result
deleted file mode 100644
index 24fba02d16b..00000000000
--- a/mysql-test/suite/perfschema/r/sizing_med.result
+++ /dev/null
@@ -1,69 +0,0 @@
-show variables like "table_definition_cache";
-Variable_name	Value
-table_definition_cache	401
-show variables like "table_open_cache";
-Variable_name	Value
-table_open_cache	401
-show variables like "max_connections";
-Variable_name	Value
-max_connections	152
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	ON
-performance_schema_accounts_size	100
-performance_schema_digests_size	5000
-performance_schema_events_stages_history_long_size	1000
-performance_schema_events_stages_history_size	10
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	10
-performance_schema_events_waits_history_long_size	1000
-performance_schema_events_waits_history_size	10
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	1079
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	1754
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	4230
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	2222
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	232
-performance_schema_max_stage_classes\t160
-performance_schema_max_table_handles	573
-performance_schema_max_table_instances	556
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	289
-performance_schema_session_connect_attrs_size	512
-performance_schema_setup_actors_size	100
-performance_schema_setup_objects_size	100
-performance_schema_users_size	100
-show status like "%performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
diff --git a/mysql-test/suite/perfschema/r/sizing_off.result b/mysql-test/suite/perfschema/r/sizing_off.result
deleted file mode 100644
index e49a9824f42..00000000000
--- a/mysql-test/suite/perfschema/r/sizing_off.result
+++ /dev/null
@@ -1,60 +0,0 @@
-show variables where
-`Variable_name` != "performance_schema_max_statement_classes" and
-`Variable_name` like "performance_schema%";
-Variable_name	Value
-performance_schema	OFF
-performance_schema_accounts_size	-1
-performance_schema_digests_size	-1
-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_waits_history_long_size	-1
-performance_schema_events_waits_history_size	-1
-performance_schema_hosts_size	-1
-performance_schema_max_cond_classes	80
-performance_schema_max_cond_instances	-1
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	-1
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	-1
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	-1
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	-1
-performance_schema_max_stage_classes\t160
-performance_schema_max_table_handles	-1
-performance_schema_max_table_instances	-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_users_size	-1
-show status like "performance_schema%";
-Variable_name	Value
-Performance_schema_accounts_lost	0
-Performance_schema_cond_classes_lost	0
-Performance_schema_cond_instances_lost	0
-Performance_schema_digest_lost	0
-Performance_schema_file_classes_lost	0
-Performance_schema_file_handles_lost	0
-Performance_schema_file_instances_lost	0
-Performance_schema_hosts_lost	0
-Performance_schema_locker_lost	0
-Performance_schema_mutex_classes_lost	0
-Performance_schema_mutex_instances_lost	0
-Performance_schema_rwlock_classes_lost	0
-Performance_schema_rwlock_instances_lost	0
-Performance_schema_session_connect_attrs_lost	0
-Performance_schema_socket_classes_lost	0
-Performance_schema_socket_instances_lost	0
-Performance_schema_stage_classes_lost	0
-Performance_schema_statement_classes_lost	0
-Performance_schema_table_handles_lost	0
-Performance_schema_table_instances_lost	0
-Performance_schema_thread_classes_lost	0
-Performance_schema_thread_instances_lost	0
-Performance_schema_users_lost	0
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 dec4dc431f5..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
@@ -8,6 +7,8 @@ set global session_track_schema=FALSE;
 # - the test might abort
 #
 # 0. Check, build or set prequisites
+Warnings:
+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
@@ -208,7 +209,9 @@ connection default;
 #       server_unix_socket are already checked
 #     - the stability of results is already checked
 #       So we con go with the results of the first run.
-# 4.6.1 The SUM_OF_BYTES_WRITE value is the same for all Connects.
+# 4.6.1 The SUM_OF_BYTES_WRITE value depends on length of database
+#       since the database name is written in OK packet.
+#       Hence the value 2.
 # 4.6.2 The SUM_OF_BYTES_WRITE value hast to be > 100.
 # 4.6.3 COUNT_READ, COUNT_WRITE and COUNT_MISC have to be to be > 0
 # 4.6.4 Checks based on comparison of results for connects
@@ -218,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/socket_summary_by_instance_func_win.result b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result
index 2c5a9e9284f..6215976eab0 100644
--- a/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result
+++ b/mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result
@@ -7,6 +7,8 @@
 # - the test might abort
 #
 # 0. Check, build or set prequisites
+Warnings:
+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
@@ -33,12 +35,30 @@ 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
+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 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
+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 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
@@ -196,7 +216,9 @@ col2
 #       server_unix_socket are already checked
 #     - the stability of results is already checked
 #       So we con go with the results of the first run.
-# 4.6.1 The SUM_OF_BYTES_WRITE value is the same for all Connects.
+# 4.6.1 The SUM_OF_BYTES_WRITE value depends on length of database
+#       since the database name is written in OK packet.
+#       Hence the value 2.
 # 4.6.2 The SUM_OF_BYTES_WRITE value hast to be > 100.
 # 4.6.3 COUNT_READ, COUNT_WRITE and COUNT_MISC have to be to be > 0
 # 4.6.4 Checks based on comparison of results for connects
@@ -206,3 +228,5 @@ col2
 #    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.
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_function.result b/mysql-test/suite/perfschema/r/stage_mdl_function.result
index 5f55dd6c28e..87068e6330d 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_function.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_function.result
@@ -14,23 +14,13 @@ username	event_name	sql_text
 user1	statement/sql/select	select test.f1()
 username	event_name	nesting_event_type
 username	event_name	nesting_event_type
-user1	stage/sql/Closing tables	STATEMENT
-user1	stage/sql/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
 call dump_one_thread('user2');
 username	event_name	sql_text
 user2	statement/sql/drop_function	drop function test.f1
 username	event_name	nesting_event_type
 user2	stage/sql/Waiting for stored function metadata lock	STATEMENT
 username	event_name	nesting_event_type
-user2	stage/sql/Init	STATEMENT
+user2	stage/sql/starting	STATEMENT
 connection con1;
 select f1();
 f1()
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_global.result b/mysql-test/suite/perfschema/r/stage_mdl_global.result
index aab68fa7cc7..b9eda506700 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_global.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_global.result
@@ -8,12 +8,12 @@ username	event_name	sql_text
 user1	statement/sql/flush	flush tables with read lock
 username	event_name	nesting_event_type
 username	event_name	nesting_event_type
-user1	stage/sql/Init	STATEMENT
-user1	stage/sql/Init	STATEMENT
+user1	stage/sql/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
@@ -23,8 +23,8 @@ 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
-user2	stage/sql/Init	STATEMENT
-user2	stage/sql/Checking permissions	STATEMENT
+user2	stage/sql/starting	STATEMENT
+user2	stage/sql/checking permissions	STATEMENT
 user2	stage/sql/Opening tables	STATEMENT
 connection con1;
 unlock tables;
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_procedure.result b/mysql-test/suite/perfschema/r/stage_mdl_procedure.result
index 6362f725b88..613a20fdd4f 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_procedure.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_procedure.result
@@ -21,23 +21,13 @@ username	event_name	sql_text
 user1	statement/sql/select	select test.f1()
 username	event_name	nesting_event_type
 username	event_name	nesting_event_type
-user1	stage/sql/Closing tables	STATEMENT
-user1	stage/sql/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
 call dump_one_thread('user2');
 username	event_name	sql_text
 user2	statement/sql/drop_procedure	drop procedure test.p1
 username	event_name	nesting_event_type
 user2	stage/sql/Waiting for stored procedure metadata lock	STATEMENT
 username	event_name	nesting_event_type
-user2	stage/sql/Init	STATEMENT
+user2	stage/sql/starting	STATEMENT
 connection con1;
 select test.f1();
 test.f1()
diff --git a/mysql-test/suite/perfschema/r/stage_mdl_table.result b/mysql-test/suite/perfschema/r/stage_mdl_table.result
index c703e910891..5ba0ba04fca 100644
--- a/mysql-test/suite/perfschema/r/stage_mdl_table.result
+++ b/mysql-test/suite/perfschema/r/stage_mdl_table.result
@@ -20,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
@@ -32,13 +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
-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/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 294c3a72f58..00baba09fb6 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_idle.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_idle.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%";
 select * from performance_schema.setup_instruments
 where name like "idle" and enabled='YES';
 NAME	ENABLED	TIMED
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 6ed2234babe..6fe051b3c42 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_stages.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_stages.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%";
 select * from performance_schema.setup_instruments
 where name like "stage/%" and enabled='YES';
 NAME	ENABLED	TIMED
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 f942f2ee570..b582ca072c8 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_statements.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_statements.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%";
 select * from performance_schema.setup_instruments
 where name like "statement/%" and enabled='YES';
 NAME	ENABLED	TIMED
diff --git a/mysql-test/suite/perfschema/r/start_server_disable_transactions.result b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result
new file mode 100644
index 00000000000..1431f925ae2
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_disable_transactions.result
@@ -0,0 +1,167 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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 global status like "performance_schema%";
+select * from performance_schema.setup_instruments
+where name in ('transaction') and enabled='YES';
+NAME	ENABLED	TIMED
+select * from performance_schema.events_transactions_summary_global_by_event_name
+where count_star > 0;
+EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ_WRITE	SUM_TIMER_READ_WRITE	MIN_TIMER_READ_WRITE	AVG_TIMER_READ_WRITE	MAX_TIMER_READ_WRITE	COUNT_READ_ONLY	SUM_TIMER_READ_ONLY	MIN_TIMER_READ_ONLY	AVG_TIMER_READ_ONLY	MAX_TIMER_READ_ONLY
+select * from performance_schema.events_transactions_summary_by_thread_by_event_name
+where count_star > 0;
+THREAD_ID	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ_WRITE	SUM_TIMER_READ_WRITE	MIN_TIMER_READ_WRITE	AVG_TIMER_READ_WRITE	MAX_TIMER_READ_WRITE	COUNT_READ_ONLY	SUM_TIMER_READ_ONLY	MIN_TIMER_READ_ONLY	AVG_TIMER_READ_ONLY	MAX_TIMER_READ_ONLY
+select * from performance_schema.events_transactions_summary_by_user_by_event_name
+where count_star > 0;
+USER	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ_WRITE	SUM_TIMER_READ_WRITE	MIN_TIMER_READ_WRITE	AVG_TIMER_READ_WRITE	MAX_TIMER_READ_WRITE	COUNT_READ_ONLY	SUM_TIMER_READ_ONLY	MIN_TIMER_READ_ONLY	AVG_TIMER_READ_ONLY	MAX_TIMER_READ_ONLY
+select * from performance_schema.events_transactions_summary_by_host_by_event_name
+where count_star > 0;
+HOST	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ_WRITE	SUM_TIMER_READ_WRITE	MIN_TIMER_READ_WRITE	AVG_TIMER_READ_WRITE	MAX_TIMER_READ_WRITE	COUNT_READ_ONLY	SUM_TIMER_READ_ONLY	MIN_TIMER_READ_ONLY	AVG_TIMER_READ_ONLY	MAX_TIMER_READ_ONLY
+select * from performance_schema.events_transactions_summary_by_account_by_event_name
+where count_star > 0;
+USER	HOST	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ_WRITE	SUM_TIMER_READ_WRITE	MIN_TIMER_READ_WRITE	AVG_TIMER_READ_WRITE	MAX_TIMER_READ_WRITE	COUNT_READ_ONLY	SUM_TIMER_READ_ONLY	MIN_TIMER_READ_ONLY	AVG_TIMER_READ_ONLY	MAX_TIMER_READ_ONLY
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 fb02ace2ed4..1b9356b34a2 100644
--- a/mysql-test/suite/perfschema/r/start_server_disable_waits.result
+++ b/mysql-test/suite/perfschema/r/start_server_disable_waits.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%";
 select * from performance_schema.setup_instruments
 where name like "wait/%" and enabled='YES';
 NAME	ENABLED	TIMED
diff --git a/mysql-test/suite/perfschema/r/start_server_innodb.result b/mysql-test/suite/perfschema/r/start_server_innodb.result
index cf210c0935c..c64e4f8416d 100644
--- a/mysql-test/suite/perfschema/r/start_server_innodb.result
+++ b/mysql-test/suite/perfschema/r/start_server_innodb.result
@@ -10,16 +10,144 @@ 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 status like "performance_schema%";
+show global status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -29,9 +157,15 @@ 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
@@ -41,6 +175,7 @@ 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
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
new file mode 100644
index 00000000000..3b2553ab92e
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_low_digest_sql_length.result
@@ -0,0 +1,12 @@
+USE performance_schema;
+truncate table events_statements_history_long;
+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;
+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
+74
+####################################
+# QUERYING PS STATEMENT DIGEST
+####################################
+SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
+event_name	digest	digest_text	sql_text
+statement/sql/truncate	7b0d115e24864223fc76daf23b302766	TRUNCATE TABLE 	truncat...
+statement/sql/select	26ffe5453ab8b87b608f9bcd76dc54a3	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
new file mode 100644
index 00000000000..9fd9a8a447c
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_low_index.result
@@ -0,0 +1,280 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	34
+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%";
+drop table if exists db1.t1;
+drop database if exists db1;
+create database db1;
+create table db1.t1 (a int, b char(10) default 'default',
+unique key uidx(a));
+insert into db1.t1 values('1', 'abc');
+insert into db1.t1 values('2', 'abc');
+select * from db1.t1 where a='1';
+a	b
+1	abc
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME
+from performance_schema.table_io_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
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME
+from performance_schema.table_io_waits_summary_by_index_usage
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME
+2	TABLE	db1	t1	NULL
+1	TABLE	db1	t1	uidx
+flush tables;
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME
+from performance_schema.table_io_waits_summary_by_table
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME
+1	TABLE	db1	t1
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME
+from performance_schema.table_io_waits_summary_by_index_usage
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME
+1	TABLE	db1	t1	uidx
+select variable_value > 0 from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+variable_value > 0
+1
+FLUSH STATUS;
+select variable_value from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+variable_value
+0
+create table db1.t2 (a int, b char(10) default 'default',
+unique key uidx(a));
+insert into db1.t1 values('3', 'abc');
+insert into db1.t1 values('4', 'abc');
+select * from db1.t1 where a='1';
+a	b
+1	abc
+insert into db1.t2 values('1', 'abc');
+insert into db1.t2 values('2', 'abc');
+select * from db1.t2 where a='1';
+a	b
+1	abc
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME
+from performance_schema.table_io_waits_summary_by_table
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME
+4	TABLE	db1	t1
+3	TABLE	db1	t2
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME
+from performance_schema.table_io_waits_summary_by_index_usage
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME
+2	TABLE	db1	t1	NULL
+2	TABLE	db1	t1	uidx
+2	TABLE	db1	t2	NULL
+1	TABLE	db1	t2	(index 0)
+flush tables;
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME
+from performance_schema.table_io_waits_summary_by_table
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME
+2	TABLE	db1	t1
+0	TABLE	db1	t2
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME
+from performance_schema.table_io_waits_summary_by_index_usage
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME
+2	TABLE	db1	t1	uidx
+select variable_value > 0 from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+variable_value > 0
+1
+FLUSH STATUS;
+update performance_schema.setup_objects set ENABLED='NO' where OBJECT_TYPE='TABLE';
+insert into db1.t1 values('5', 'abc');
+insert into db1.t1 values('6', 'abc');
+select * from db1.t1 where a='1';
+a	b
+1	abc
+insert into db1.t2 values('3', 'abc');
+insert into db1.t2 values('4', 'abc');
+select * from db1.t2 where a='1';
+a	b
+1	abc
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME
+from performance_schema.table_io_waits_summary_by_table
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME
+from performance_schema.table_io_waits_summary_by_index_usage
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME
+flush tables;
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME
+from performance_schema.table_io_waits_summary_by_table
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME
+select COUNT_STAR, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME
+from performance_schema.table_io_waits_summary_by_index_usage
+where OBJECT_SCHEMA='db1'
+  order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, INDEX_NAME;
+COUNT_STAR	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME
+select variable_value from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+variable_value
+0
+drop database db1;
+update performance_schema.setup_objects set ENABLED='YES'
+  where OBJECT_TYPE='TABLE' and OBJECT_SCHEMA="%";
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
new file mode 100644
index 00000000000..981fa297971
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_low_table_lock.result
@@ -0,0 +1,237 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	1
+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%";
+drop table if exists db1.t1;
+drop database if exists db1;
+create database db1;
+create table db1.t1 (a int, b char(10) default 'default');
+insert into db1.t1 values('1', 'abc');
+insert into db1.t1 values('2', 'abc');
+select * from db1.t1 where a='1';
+a	b
+1	abc
+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
+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
+select variable_value from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
+variable_value
+0
+create table db1.t2 (a int, b char(10) default 'default',
+unique key uidx(a));
+insert into db1.t1 values('3', 'abc');
+insert into db1.t1 values('4', 'abc');
+select * from db1.t1 where a='1';
+a	b
+1	abc
+insert into db1.t2 values('1', 'abc');
+insert into db1.t2 values('2', 'abc');
+select * from db1.t2 where a='1';
+a	b
+1	abc
+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
+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
+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';
+variable_value > 0
+1
+flush status;
+update performance_schema.setup_objects set ENABLED='NO'
+  where OBJECT_TYPE='TABLE' and OBJECT_SCHEMA="%";
+insert into db1.t1 values('5', 'abc');
+insert into db1.t1 values('6', 'abc');
+select * from db1.t1 where a='1';
+a	b
+1	abc
+insert into db1.t2 values('3', 'abc');
+insert into db1.t2 values('4', 'abc');
+select * from db1.t2 where a='1';
+a	b
+1	abc
+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
+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
+select variable_value from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
+variable_value
+0
+drop database db1;
+update performance_schema.setup_objects set ENABLED='YES'
+  where OBJECT_TYPE='TABLE' and OBJECT_SCHEMA="%";
diff --git a/mysql-test/suite/perfschema/r/start_server_no_account.result b/mysql-test/suite/perfschema/r/start_server_no_account.result
index c02b75e5c33..4333c6f74d2 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_account.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_account.result
@@ -10,16 +10,144 @@ 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	0
+performance_schema_digests_size	200
+performance_schema_events_stages_history_long_size	1000
+performance_schema_events_stages_history_size	10
+performance_schema_events_statements_history_long_size	1000
+performance_schema_events_statements_history_size	10
+performance_schema_events_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 variables like "performance_schema_accounts_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_accounts_size";
 Variable_name	Value
 performance_schema_accounts_size	0
 select count(*) from performance_schema.accounts;
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 a3e16b4be8d..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_max_cond_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_cond_classes";
 Variable_name	Value
 performance_schema_max_cond_classes	0
 select count(*) from performance_schema.setup_instruments
@@ -33,6 +161,6 @@ variable_value > 0
 select count(*) from performance_schema.cond_instances;
 count(*)
 0
-show status like "performance_schema_cond_instances_lost";
+show global status like "performance_schema_cond_instances_lost";
 Variable_name	Value
 Performance_schema_cond_instances_lost	0
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 bb3d0a24db9..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
@@ -10,26 +10,154 @@ 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	0
+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 variables like "performance_schema_max_cond_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_cond_classes";
 Variable_name	Value
 performance_schema_max_cond_classes	90
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/synch/cond/%";
 count(*) > 0
 1
-show status like "performance_schema_cond_classes_lost";
+show global status like "performance_schema_cond_classes_lost";
 Variable_name	Value
 Performance_schema_cond_classes_lost	0
-show variables like "performance_schema_max_cond_instances";
+show global variables like "performance_schema_max_cond_instances";
 Variable_name	Value
 performance_schema_max_cond_instances	0
 select count(*) from performance_schema.cond_instances;
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 f8301e62a7f..e3072cb2fe7 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_digests.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_digests.result
@@ -112,7 +112,7 @@ 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;
 SCHEMA_NAME	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-SHOW VARIABLES LIKE "performance_schema_digests_size";
+SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size";
 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 5e6da344a70..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_max_file_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_file_classes";
 Variable_name	Value
 performance_schema_max_file_classes	0
 select count(*) from performance_schema.setup_instruments
@@ -33,6 +161,6 @@ variable_value > 0
 select count(*) from performance_schema.file_instances;
 count(*)
 0
-show status like "performance_schema_file_instances_lost";
+show global status like "performance_schema_file_instances_lost";
 Variable_name	Value
 Performance_schema_file_instances_lost	0
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 33dce305ef3..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
@@ -10,26 +10,154 @@ 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	0
+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 variables like "performance_schema_max_file_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_file_classes";
 Variable_name	Value
-performance_schema_max_file_classes	50
+performance_schema_max_file_classes	80
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/io/file/%";
 count(*) > 0
 1
-show status like "performance_schema_file_classes_lost";
+show global status like "performance_schema_file_classes_lost";
 Variable_name	Value
 Performance_schema_file_classes_lost	0
-show variables like "performance_schema_max_file_instances";
+show global variables like "performance_schema_max_file_instances";
 Variable_name	Value
 performance_schema_max_file_instances	0
 select count(*) from performance_schema.file_instances;
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 a4f362b256f..b58acf57362 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_host.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_host.result
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_hosts_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_hosts_size";
 Variable_name	Value
 performance_schema_hosts_size	0
 select count(*) from performance_schema.hosts;
diff --git a/mysql-test/suite/perfschema/r/start_server_no_index.result b/mysql-test/suite/perfschema/r/start_server_no_index.result
new file mode 100644
index 00000000000..9e7a2bf34a7
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_no_index.result
@@ -0,0 +1,185 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	0
+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%";
+drop table if exists db1.t1;
+drop database if exists db1;
+create database db1;
+create table db1.t1 (a int, b char(10) default 'default',
+unique key uidx(a));
+insert into db1.t1 values('1', 'abc');
+insert into db1.t1 values('2', 'abc');
+select * from db1.t1 where a='1';
+a	b
+1	abc
+select COUNT_STAR from performance_schema.table_io_waits_summary_by_table
+where OBJECT_SCHEMA='db1' and OBJECT_NAME='t1';
+COUNT_STAR
+3
+select COUNT_STAR from performance_schema.table_io_waits_summary_by_index_usage
+where INDEX_NAME!='NULL';
+COUNT_STAR
+1
+FLUSH TABLES;
+select COUNT_STAR from performance_schema.table_io_waits_summary_by_table
+where OBJECT_SCHEMA='db1' and OBJECT_NAME='t1';
+COUNT_STAR
+0
+select COUNT_STAR from performance_schema.table_io_waits_summary_by_index_usage
+where INDEX_NAME!='NULL';
+COUNT_STAR
+select variable_value > 0 from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+variable_value > 0
+1
+FLUSH STATUS;
+select variable_value from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+variable_value
+0
+drop database db1;
diff --git a/mysql-test/suite/perfschema/r/start_server_no_mdl.result b/mysql-test/suite/perfschema/r/start_server_no_mdl.result
new file mode 100644
index 00000000000..886a1ee1633
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_no_mdl.result
@@ -0,0 +1,161 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	0
+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 count(*) from performance_schema.metadata_locks;
+count(*)
+0
+select variable_value > 0 from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_METADATA_LOCK_LOST';
+variable_value > 0
+1
+FLUSH STATUS;
+select variable_value from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_METADATA_LOCK_LOST';
+variable_value
+0
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
new file mode 100644
index 00000000000..a6605cc5ffb
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_no_memory_class.result
@@ -0,0 +1,235 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	0
+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%";
+show global variables like "performance_schema_max_memory_classes";
+Variable_name	Value
+performance_schema_max_memory_classes	0
+select name from performance_schema.setup_instruments
+where name like "memory/performance_schema/%"
+  order by name;
+name
+memory/performance_schema/accounts
+memory/performance_schema/cond_class
+memory/performance_schema/cond_instances
+memory/performance_schema/events_stages_history
+memory/performance_schema/events_stages_history_long
+memory/performance_schema/events_stages_summary_by_account_by_event_name
+memory/performance_schema/events_stages_summary_by_host_by_event_name
+memory/performance_schema/events_stages_summary_by_thread_by_event_name
+memory/performance_schema/events_stages_summary_by_user_by_event_name
+memory/performance_schema/events_stages_summary_global_by_event_name
+memory/performance_schema/events_statements_current
+memory/performance_schema/events_statements_current.sqltext
+memory/performance_schema/events_statements_current.tokens
+memory/performance_schema/events_statements_history
+memory/performance_schema/events_statements_history.sqltext
+memory/performance_schema/events_statements_history.tokens
+memory/performance_schema/events_statements_history_long
+memory/performance_schema/events_statements_history_long.sqltext
+memory/performance_schema/events_statements_history_long.tokens
+memory/performance_schema/events_statements_summary_by_account_by_event_name
+memory/performance_schema/events_statements_summary_by_digest
+memory/performance_schema/events_statements_summary_by_digest.tokens
+memory/performance_schema/events_statements_summary_by_host_by_event_name
+memory/performance_schema/events_statements_summary_by_program
+memory/performance_schema/events_statements_summary_by_thread_by_event_name
+memory/performance_schema/events_statements_summary_by_user_by_event_name
+memory/performance_schema/events_statements_summary_global_by_event_name
+memory/performance_schema/events_transactions_history
+memory/performance_schema/events_transactions_history_long
+memory/performance_schema/events_transactions_summary_by_account_by_event_name
+memory/performance_schema/events_transactions_summary_by_host_by_event_name
+memory/performance_schema/events_transactions_summary_by_thread_by_event_name
+memory/performance_schema/events_transactions_summary_by_user_by_event_name
+memory/performance_schema/events_waits_history
+memory/performance_schema/events_waits_history_long
+memory/performance_schema/events_waits_summary_by_account_by_event_name
+memory/performance_schema/events_waits_summary_by_host_by_event_name
+memory/performance_schema/events_waits_summary_by_thread_by_event_name
+memory/performance_schema/events_waits_summary_by_user_by_event_name
+memory/performance_schema/file_class
+memory/performance_schema/file_handle
+memory/performance_schema/file_instances
+memory/performance_schema/hosts
+memory/performance_schema/memory_class
+memory/performance_schema/memory_summary_by_account_by_event_name
+memory/performance_schema/memory_summary_by_host_by_event_name
+memory/performance_schema/memory_summary_by_thread_by_event_name
+memory/performance_schema/memory_summary_by_user_by_event_name
+memory/performance_schema/memory_summary_global_by_event_name
+memory/performance_schema/metadata_locks
+memory/performance_schema/mutex_class
+memory/performance_schema/mutex_instances
+memory/performance_schema/prepared_statements_instances
+memory/performance_schema/rwlock_class
+memory/performance_schema/rwlock_instances
+memory/performance_schema/scalable_buffer
+memory/performance_schema/session_connect_attrs
+memory/performance_schema/setup_actors
+memory/performance_schema/setup_objects
+memory/performance_schema/socket_class
+memory/performance_schema/socket_instances
+memory/performance_schema/stage_class
+memory/performance_schema/statement_class
+memory/performance_schema/table_handles
+memory/performance_schema/table_io_waits_summary_by_index_usage
+memory/performance_schema/table_lock_waits_summary_by_table
+memory/performance_schema/table_shares
+memory/performance_schema/threads
+memory/performance_schema/thread_class
+memory/performance_schema/users
+select count(*) from performance_schema.setup_instruments
+where name like "memory/%"
+    and name not like "memory/performance_schema/%";
+count(*)
+0
+select variable_value > 0 from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_MEMORY_CLASSES_LOST';
+variable_value > 0
+1
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 9fadcc581c7..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_max_mutex_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_mutex_classes";
 Variable_name	Value
 performance_schema_max_mutex_classes	0
 select count(*) from performance_schema.setup_instruments
@@ -33,6 +161,6 @@ variable_value > 0
 select count(*) from performance_schema.mutex_instances;
 count(*)
 0
-show status like "performance_schema_mutex_instances_lost";
+show global status like "performance_schema_mutex_instances_lost";
 Variable_name	Value
 Performance_schema_mutex_instances_lost	0
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 c443a4e58db..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
@@ -10,26 +10,154 @@ 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	0
+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 variables like "performance_schema_max_mutex_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_mutex_classes";
 Variable_name	Value
-performance_schema_max_mutex_classes	200
+performance_schema_max_mutex_classes	210
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/synch/mutex/%";
 count(*) > 0
 1
-show status like "performance_schema_mutex_classes_lost";
+show global status like "performance_schema_mutex_classes_lost";
 Variable_name	Value
 Performance_schema_mutex_classes_lost	0
-show variables like "performance_schema_max_mutex_instances";
+show global variables like "performance_schema_max_mutex_instances";
 Variable_name	Value
 performance_schema_max_mutex_instances	0
 select count(*) from performance_schema.mutex_instances;
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
new file mode 100644
index 00000000000..32356175e82
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_no_prepared_stmts_instances.result
@@ -0,0 +1,212 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	0
+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%";
+CREATE DATABASE db;
+USE db;
+show global variables like "performance_schema_max_prepared_statements_instances";
+Variable_name	Value
+performance_schema_max_prepared_statements_instances	0
+select count(*) from performance_schema.prepared_statements_instances;
+count(*)
+0
+truncate table performance_schema.prepared_statements_instances;
+CREATE TABLE t1 (a INT NOT NULL);
+INSERT INTO t1 VALUES (4), (8), (11), (32), (80);
+PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse';
+SET @table = 't1';
+SET @s = CONCAT('SELECT * FROM ', @table);
+PREPARE st2 FROM @s;
+PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?';
+PREPARE st4 FROM
+'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a';
+show global status like "%performance_schema_prepared_statements_lost%";
+Variable_name	Value
+Performance_schema_prepared_statements_lost	4
+SET @a = 3;
+SET @b = 4;
+EXECUTE st1 USING @a, @b;
+hypotenuse
+5
+EXECUTE st2;
+a
+4
+8
+11
+32
+80
+SET @c=3;
+EXECUTE st3 using @c;
+EXECUTE st4;
+a
+4
+8
+11
+14
+18
+21
+32
+42
+80
+90
+show global status like "%performance_schema_prepared_statements_lost%";
+Variable_name	Value
+Performance_schema_prepared_statements_lost	4
+DEALLOCATE PREPARE st1;
+DEALLOCATE PREPARE st2;
+DEALLOCATE PREPARE st3;
+DEALLOCATE PREPARE st4;
+DROP TABLE t1;
+show global status like "%performance_schema_prepared_statements_lost%";
+Variable_name	Value
+Performance_schema_prepared_statements_lost	4
+flush status;
+show global status like "%performance_schema_prepared_statements_lost%";
+Variable_name	Value
+Performance_schema_prepared_statements_lost	0
+DROP DATABASE db;
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 c3939ced060..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_max_rwlock_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_rwlock_classes";
 Variable_name	Value
 performance_schema_max_rwlock_classes	0
 select count(*) from performance_schema.setup_instruments
@@ -33,6 +161,6 @@ variable_value > 0
 select count(*) from performance_schema.rwlock_instances;
 count(*)
 0
-show status like "performance_schema_rwlock_instances_lost";
+show global status like "performance_schema_rwlock_instances_lost";
 Variable_name	Value
 Performance_schema_rwlock_instances_lost	0
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 7892c6ba753..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
@@ -10,26 +10,154 @@ 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	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	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 variables like "performance_schema_max_rwlock_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_rwlock_classes";
 Variable_name	Value
-performance_schema_max_rwlock_classes	40
+performance_schema_max_rwlock_classes	50
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/synch/rwlock/%";
 count(*) > 0
 1
-show status like "performance_schema_rwlock_classes_lost";
+show global status like "performance_schema_rwlock_classes_lost";
 Variable_name	Value
 Performance_schema_rwlock_classes_lost	0
-show variables like "performance_schema_max_rwlock_instances";
+show global variables like "performance_schema_max_rwlock_instances";
 Variable_name	Value
 performance_schema_max_rwlock_instances	0
 select count(*) from performance_schema.rwlock_instances;
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 24b0ee16685..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
@@ -10,16 +10,144 @@ 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	0
+performance_schema_setup_objects_size	100
+performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
-show status like "performance_schema%";
-show variables like "performance_schema_setup_actors_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_setup_actors_size";
 Variable_name	Value
 performance_schema_setup_actors_size	0
 select count(*) from performance_schema.setup_actors;
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 630284c69be..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
@@ -10,16 +10,144 @@ 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	0
+performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
-show status like "performance_schema%";
-show variables like "performance_schema_setup_objects_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_setup_objects_size";
 Variable_name	Value
 performance_schema_setup_objects_size	0
 select count(*) from performance_schema.setup_objects;
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 45e353a1372..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_max_socket_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_socket_classes";
 Variable_name	Value
 performance_schema_max_socket_classes	0
 select count(*) from performance_schema.setup_instruments
@@ -33,6 +161,6 @@ variable_value > 0
 select count(*) from performance_schema.socket_instances;
 count(*)
 0
-show status like "performance_schema_socket_instances_lost";
+show global status like "performance_schema_socket_instances_lost";
 Variable_name	Value
 Performance_schema_socket_instances_lost	0
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 0c78ec66db9..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
@@ -10,26 +10,154 @@ 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	0
+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 variables like "performance_schema_max_socket_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_socket_classes";
 Variable_name	Value
 performance_schema_max_socket_classes	10
 select count(*) > 0 from performance_schema.setup_instruments
 where name like "wait/io/socket/%";
 count(*) > 0
 1
-show status like "performance_schema_socket_classes_lost";
+show global status like "performance_schema_socket_classes_lost";
 Variable_name	Value
 Performance_schema_socket_classes_lost	0
-show variables like "performance_schema_max_socket_instances";
+show global variables like "performance_schema_max_socket_instances";
 Variable_name	Value
 performance_schema_max_socket_instances	0
 select count(*) from performance_schema.socket_instances;
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 f3e95c3ac7b..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_max_stage_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_stage_classes";
 Variable_name	Value
 performance_schema_max_stage_classes	0
 select count(*) from performance_schema.setup_instruments
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 2e5005323dd..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_events_stages_history_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_events_stages_history_size";
 Variable_name	Value
 performance_schema_events_stages_history_size	0
 select count(*) from performance_schema.events_stages_history;
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 cb29a5812fc..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
@@ -10,16 +10,144 @@ 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	0
+performance_schema_events_stages_history_size	10
+performance_schema_events_statements_history_long_size	1000
+performance_schema_events_statements_history_size	10
+performance_schema_events_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 variables like "performance_schema_events_stages_history_long_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_events_stages_history_long_size";
 Variable_name	Value
 performance_schema_events_stages_history_long_size	0
 select count(*) from performance_schema.events_stages_history_long;
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 d62b4ba1daa..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_max_statement_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_statement_classes";
 Variable_name	Value
 performance_schema_max_statement_classes	0
 select count(*) from performance_schema.setup_instruments
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 ed4b2870e6d..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_events_statements_history_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_events_statements_history_size";
 Variable_name	Value
 performance_schema_events_statements_history_size	0
 select count(*) from performance_schema.events_statements_history;
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 a48d5fa9339..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_events_statements_history_long_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_events_statements_history_long_size";
 Variable_name	Value
 performance_schema_events_statements_history_long_size	0
 select count(*) from performance_schema.events_statements_history_long;
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 5bc38231122..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
@@ -10,19 +10,147 @@ 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	0
+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 variables like "performance_schema_max_table_instances";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_table_instances";
 Variable_name	Value
 performance_schema_max_table_instances	500
-show variables like "performance_schema_max_table_handles";
+show global variables like "performance_schema_max_table_handles";
 Variable_name	Value
 performance_schema_max_table_handles	0
 drop table if exists test.instrument_me;
@@ -34,7 +162,7 @@ a
 2
 3
 drop table test.instrument_me;
-show variables like "performance_schema_max_table_instances";
+show global variables like "performance_schema_max_table_instances";
 Variable_name	Value
 performance_schema_max_table_instances	500
 select variable_value > 0 from information_schema.global_status
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 def59b8b54b..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
@@ -10,19 +10,147 @@ 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	0
+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	0
+performance_schema_max_table_lock_stat	0
+performance_schema_max_thread_classes	50
+performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
+performance_schema_setup_actors_size	100
+performance_schema_setup_objects_size	100
+performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
-show status like "performance_schema%";
-show variables like "performance_schema_max_table_instances";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_table_instances";
 Variable_name	Value
 performance_schema_max_table_instances	0
-show variables like "performance_schema_max_table_handles";
+show global variables like "performance_schema_max_table_handles";
 Variable_name	Value
 performance_schema_max_table_handles	1000
 drop table if exists test.instrument_me;
@@ -38,6 +166,6 @@ select variable_value > 0 from information_schema.global_status
 where variable_name like 'PERFORMANCE_SCHEMA_TABLE_INSTANCES_LOST';
 variable_value > 0
 1
-show status like "performance_schema_table_handles_lost";
+show global status like "performance_schema_table_handles_lost";
 Variable_name	Value
 Performance_schema_table_handles_lost	0
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
new file mode 100644
index 00000000000..a93f900f650
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_no_table_lock.result
@@ -0,0 +1,177 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	0
+performance_schema_max_thread_classes	50
+performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
+performance_schema_setup_actors_size	100
+performance_schema_setup_objects_size	100
+performance_schema_users_size	100
+show engine PERFORMANCE_SCHEMA status;
+show global status like "performance_schema%";
+drop table if exists db1.t1;
+drop database if exists db1;
+create database db1;
+create table db1.t1 (a int, b char(10) default 'default');
+insert into db1.t1 values('1', 'abc');
+insert into db1.t1 values('2', 'abc');
+select * from db1.t1 where a='1';
+a	b
+1	abc
+select COUNT_STAR from performance_schema.table_lock_waits_summary_by_table
+where OBJECT_SCHEMA='db1' and OBJECT_NAME='t1';
+COUNT_STAR
+6
+FLUSH TABLES;
+select COUNT_STAR from performance_schema.table_lock_waits_summary_by_table
+where OBJECT_SCHEMA='db1' and OBJECT_NAME='t1';
+COUNT_STAR
+0
+select variable_value > 0 from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
+variable_value > 0
+1
+FLUSH STATUS;
+select variable_value from information_schema.global_status
+where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
+variable_value
+0
+drop database db1;
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 16952409b56..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
@@ -10,16 +10,144 @@ 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	0
+performance_schema_max_thread_instances	200
+performance_schema_session_connect_attrs_size	2048
+performance_schema_setup_actors_size	100
+performance_schema_setup_objects_size	100
+performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
-show status like "performance_schema%";
-show variables like "performance_schema_max_thread_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_thread_classes";
 Variable_name	Value
 performance_schema_max_thread_classes	0
 select count(*) from performance_schema.setup_instruments
@@ -33,6 +161,6 @@ variable_value > 0
 select count(*) from performance_schema.threads;
 count(*)
 0
-show status like "performance_schema_thread_instances_lost";
+show global status like "performance_schema_thread_instances_lost";
 Variable_name	Value
 Performance_schema_thread_instances_lost	0
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 e3ccd3f91e6..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
@@ -10,22 +10,150 @@ 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	0
+performance_schema_session_connect_attrs_size	2048
+performance_schema_setup_actors_size	100
+performance_schema_setup_objects_size	100
+performance_schema_users_size	100
 show engine PERFORMANCE_SCHEMA status;
-show status like "performance_schema%";
-show variables like "performance_schema_max_thread_classes";
+show global status like "performance_schema%";
+show global variables like "performance_schema_max_thread_classes";
 Variable_name	Value
 performance_schema_max_thread_classes	50
-show status like "performance_schema_thread_classes_lost";
+show global status like "performance_schema_thread_classes_lost";
 Variable_name	Value
 Performance_schema_thread_classes_lost	0
-show variables like "performance_schema_max_thread_instances";
+show global variables like "performance_schema_max_thread_instances";
 Variable_name	Value
 performance_schema_max_thread_instances	0
 select count(*) from performance_schema.threads;
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
new file mode 100644
index 00000000000..1d5597f554b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history.result
@@ -0,0 +1,156 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	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	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%";
+show global variables like "performance_schema_events_transactions_history_size";
+Variable_name	Value
+performance_schema_events_transactions_history_size	0
+select count(*) from performance_schema.events_transactions_history;
+count(*)
+0
+truncate table performance_schema.events_transactions_history;
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
new file mode 100644
index 00000000000..99e170c9bb1
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_no_transactions_history_long.result
@@ -0,0 +1,156 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	0
+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%";
+show global variables like "performance_schema_events_transactions_history_long_size";
+Variable_name	Value
+performance_schema_events_transactions_history_long_size	0
+select count(*) from performance_schema.events_transactions_history_long;
+count(*)
+0
+truncate table performance_schema.events_transactions_history_long;
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 7f006d6b47a..46aaa06bf65 100644
--- a/mysql-test/suite/perfschema/r/start_server_no_user.result
+++ b/mysql-test/suite/perfschema/r/start_server_no_user.result
@@ -10,16 +10,144 @@ 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	0
 show engine PERFORMANCE_SCHEMA status;
-show status like "performance_schema%";
-show variables like "performance_schema_users_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_users_size";
 Variable_name	Value
 performance_schema_users_size	0
 select count(*) from performance_schema.users;
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 27122723030..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_events_waits_history_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_events_waits_history_size";
 Variable_name	Value
 performance_schema_events_waits_history_size	0
 select count(*) from performance_schema.events_waits_history;
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 16ee8a30343..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
@@ -10,16 +10,144 @@ 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	0
+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 variables like "performance_schema_events_waits_history_long_size";
+show global status like "performance_schema%";
+show global variables like "performance_schema_events_waits_history_long_size";
 Variable_name	Value
 performance_schema_events_waits_history_long_size	0
 select count(*) from performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/start_server_nothing.result b/mysql-test/suite/perfschema/r/start_server_nothing.result
index 2aa5658f98c..5dcda26313a 100644
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result
@@ -10,24 +10,154 @@ count(*)
 5
 select count(*) from performance_schema.setup_consumers;
 count(*)
-12
-select count(*) > 3 from performance_schema.setup_instruments;
-count(*) > 3
-0
+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	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	1000
+performance_schema_events_transactions_history_size	10
+performance_schema_events_waits_history_long_size	0
+performance_schema_events_waits_history_size	0
+performance_schema_hosts_size	0
+performance_schema_max_cond_classes	0
+performance_schema_max_cond_instances	0
+performance_schema_max_digest_length	1024
+performance_schema_max_file_classes	0
+performance_schema_max_file_handles	0
+performance_schema_max_file_instances	0
+performance_schema_max_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	100
+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	1024
+performance_schema_max_stage_classes	0
+performance_schema_max_statement_classes	0
+performance_schema_max_statement_stack	1
+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
 show engine PERFORMANCE_SCHEMA status;
-show status like "performance_schema%";
-show variables like "performance_schema%";
+show global status like "performance_schema%";
+show global variables like "performance_schema%";
 Variable_name	Value
 performance_schema	ON
 performance_schema_accounts_size	0
-performance_schema_digests_size	200
+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	1000
+performance_schema_events_transactions_history_size	10
 performance_schema_events_waits_history_long_size	0
 performance_schema_events_waits_history_size	0
 performance_schema_hosts_size	0
@@ -37,27 +167,108 @@ performance_schema_max_digest_length	1024
 performance_schema_max_file_classes	0
 performance_schema_max_file_handles	0
 performance_schema_max_file_instances	0
+performance_schema_max_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	100
+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	1024
 performance_schema_max_stage_classes	0
 performance_schema_max_statement_classes	0
+performance_schema_max_statement_stack	1
 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
-select * from performance_schema.setup_instruments;
+select * from performance_schema.setup_instruments
+order by name;
 NAME	ENABLED	TIMED
+idle	YES	YES
+memory/performance_schema/accounts	YES	NO
+memory/performance_schema/cond_class	YES	NO
+memory/performance_schema/cond_instances	YES	NO
+memory/performance_schema/events_stages_history	YES	NO
+memory/performance_schema/events_stages_history_long	YES	NO
+memory/performance_schema/events_stages_summary_by_account_by_event_name	YES	NO
+memory/performance_schema/events_stages_summary_by_host_by_event_name	YES	NO
+memory/performance_schema/events_stages_summary_by_thread_by_event_name	YES	NO
+memory/performance_schema/events_stages_summary_by_user_by_event_name	YES	NO
+memory/performance_schema/events_stages_summary_global_by_event_name	YES	NO
+memory/performance_schema/events_statements_current	YES	NO
+memory/performance_schema/events_statements_current.sqltext	YES	NO
+memory/performance_schema/events_statements_current.tokens	YES	NO
+memory/performance_schema/events_statements_history	YES	NO
+memory/performance_schema/events_statements_history.sqltext	YES	NO
+memory/performance_schema/events_statements_history.tokens	YES	NO
+memory/performance_schema/events_statements_history_long	YES	NO
+memory/performance_schema/events_statements_history_long.sqltext	YES	NO
+memory/performance_schema/events_statements_history_long.tokens	YES	NO
+memory/performance_schema/events_statements_summary_by_account_by_event_name	YES	NO
+memory/performance_schema/events_statements_summary_by_digest	YES	NO
+memory/performance_schema/events_statements_summary_by_digest.tokens	YES	NO
+memory/performance_schema/events_statements_summary_by_host_by_event_name	YES	NO
+memory/performance_schema/events_statements_summary_by_program	YES	NO
+memory/performance_schema/events_statements_summary_by_thread_by_event_name	YES	NO
+memory/performance_schema/events_statements_summary_by_user_by_event_name	YES	NO
+memory/performance_schema/events_statements_summary_global_by_event_name	YES	NO
+memory/performance_schema/events_transactions_history	YES	NO
+memory/performance_schema/events_transactions_history_long	YES	NO
+memory/performance_schema/events_transactions_summary_by_account_by_event_name	YES	NO
+memory/performance_schema/events_transactions_summary_by_host_by_event_name	YES	NO
+memory/performance_schema/events_transactions_summary_by_thread_by_event_name	YES	NO
+memory/performance_schema/events_transactions_summary_by_user_by_event_name	YES	NO
+memory/performance_schema/events_waits_history	YES	NO
+memory/performance_schema/events_waits_history_long	YES	NO
+memory/performance_schema/events_waits_summary_by_account_by_event_name	YES	NO
+memory/performance_schema/events_waits_summary_by_host_by_event_name	YES	NO
+memory/performance_schema/events_waits_summary_by_thread_by_event_name	YES	NO
+memory/performance_schema/events_waits_summary_by_user_by_event_name	YES	NO
+memory/performance_schema/file_class	YES	NO
+memory/performance_schema/file_handle	YES	NO
+memory/performance_schema/file_instances	YES	NO
+memory/performance_schema/hosts	YES	NO
+memory/performance_schema/memory_class	YES	NO
+memory/performance_schema/memory_summary_by_account_by_event_name	YES	NO
+memory/performance_schema/memory_summary_by_host_by_event_name	YES	NO
+memory/performance_schema/memory_summary_by_thread_by_event_name	YES	NO
+memory/performance_schema/memory_summary_by_user_by_event_name	YES	NO
+memory/performance_schema/memory_summary_global_by_event_name	YES	NO
+memory/performance_schema/metadata_locks	YES	NO
+memory/performance_schema/mutex_class	YES	NO
+memory/performance_schema/mutex_instances	YES	NO
+memory/performance_schema/prepared_statements_instances	YES	NO
+memory/performance_schema/rwlock_class	YES	NO
+memory/performance_schema/rwlock_instances	YES	NO
+memory/performance_schema/scalable_buffer	YES	NO
+memory/performance_schema/session_connect_attrs	YES	NO
+memory/performance_schema/setup_actors	YES	NO
+memory/performance_schema/setup_objects	YES	NO
+memory/performance_schema/socket_class	YES	NO
+memory/performance_schema/socket_instances	YES	NO
+memory/performance_schema/stage_class	YES	NO
+memory/performance_schema/statement_class	YES	NO
+memory/performance_schema/table_handles	YES	NO
+memory/performance_schema/table_io_waits_summary_by_index_usage	YES	NO
+memory/performance_schema/table_lock_waits_summary_by_table	YES	NO
+memory/performance_schema/table_shares	YES	NO
+memory/performance_schema/threads	YES	NO
+memory/performance_schema/thread_class	YES	NO
+memory/performance_schema/users	YES	NO
+transaction	YES	YES
 wait/io/table/sql/handler	YES	YES
+wait/lock/metadata/sql/mdl	YES	YES
 wait/lock/table/sql/handler	YES	YES
-idle	YES	YES
 select TIMER_NAME from performance_schema.performance_timers;
 TIMER_NAME
 CYCLE
@@ -73,6 +284,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -85,16 +299,19 @@ idle
 wait
 stage
 statement
+transaction
+Warnings:
+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;
 NAME	OBJECT_INSTANCE_BEGIN
 select * from performance_schema.events_stages_current;
-THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	WORK_COMPLETED	WORK_ESTIMATED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
 select * from performance_schema.events_stages_history;
-THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	WORK_COMPLETED	WORK_ESTIMATED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
 select * from performance_schema.events_stages_history_long;
-THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	WORK_COMPLETED	WORK_ESTIMATED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
 select * from performance_schema.events_stages_summary_by_account_by_event_name;
 USER	HOST	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
 select * from performance_schema.events_stages_summary_by_host_by_event_name;
@@ -106,11 +323,11 @@ USER	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIME
 select * from performance_schema.events_stages_summary_global_by_event_name;
 EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
 select * from performance_schema.events_statements_current;
-THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	DIGEST	DIGEST_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	DIGEST	DIGEST_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
 select * from performance_schema.events_statements_history;
-THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	DIGEST	DIGEST_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	DIGEST	DIGEST_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
 select * from performance_schema.events_statements_history_long;
-THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	DIGEST	DIGEST_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	DIGEST	DIGEST_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
 select * from performance_schema.events_statements_summary_by_account_by_event_name;
 USER	HOST	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	SUM_LOCK_TIME	SUM_ERRORS	SUM_WARNINGS	SUM_ROWS_AFFECTED	SUM_ROWS_SENT	SUM_ROWS_EXAMINED	SUM_CREATED_TMP_DISK_TABLES	SUM_CREATED_TMP_TABLES	SUM_SELECT_FULL_JOIN	SUM_SELECT_FULL_RANGE_JOIN	SUM_SELECT_RANGE	SUM_SELECT_RANGE_CHECK	SUM_SELECT_SCAN	SUM_SORT_MERGE_PASSES	SUM_SORT_RANGE	SUM_SORT_ROWS	SUM_SORT_SCAN	SUM_NO_INDEX_USED	SUM_NO_GOOD_INDEX_USED
 select * from performance_schema.events_statements_summary_by_host_by_event_name;
@@ -142,35 +359,40 @@ EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAI
 wait/io/table/sql/handler	0	0	0	0	0
 wait/lock/table/sql/handler	0	0	0	0	0
 idle	0	0	0	0	0
+wait/lock/metadata/sql/mdl	0	0	0	0	0
 select * from performance_schema.file_instances;
 FILE_NAME	EVENT_NAME	OPEN_COUNT
 select * from performance_schema.file_summary_by_event_name;
 EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
 select * from performance_schema.file_summary_by_instance;
 FILE_NAME	EVENT_NAME	OBJECT_INSTANCE_BEGIN	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
-select * from performance_schema.session_account_connect_attrs;
-PROCESSLIST_ID	ATTR_NAME	ATTR_VALUE	ORDINAL_POSITION
-select * from performance_schema.session_connect_attrs;
-PROCESSLIST_ID	ATTR_NAME	ATTR_VALUE	ORDINAL_POSITION
-select * from performance_schema.socket_instances;
-EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
-select * from performance_schema.socket_summary_by_instance;
-EVENT_NAME	OBJECT_INSTANCE_BEGIN	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
-select * from performance_schema.socket_summary_by_event_name;
-EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
 select * from performance_schema.hosts;
 HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
+select * from performance_schema.metadata_locks;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	LOCK_TYPE	LOCK_DURATION	LOCK_STATUS	SOURCE	OWNER_THREAD_ID	OWNER_EVENT_ID
 select * from performance_schema.mutex_instances;
 NAME	OBJECT_INSTANCE_BEGIN	LOCKED_BY_THREAD_ID
 select * from performance_schema.objects_summary_global_by_type;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
 select * from performance_schema.rwlock_instances;
 NAME	OBJECT_INSTANCE_BEGIN	WRITE_LOCKED_BY_THREAD_ID	READ_LOCKED_BY_COUNT
+select * from performance_schema.session_account_connect_attrs;
+PROCESSLIST_ID	ATTR_NAME	ATTR_VALUE	ORDINAL_POSITION
+select * from performance_schema.session_connect_attrs;
+PROCESSLIST_ID	ATTR_NAME	ATTR_VALUE	ORDINAL_POSITION
 select * from performance_schema.setup_actors;
-HOST	USER	ROLE
+HOST	USER	ROLE	ENABLED	HISTORY
 select * from performance_schema.setup_objects;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
+select * from performance_schema.socket_instances;
+EVENT_NAME	OBJECT_INSTANCE_BEGIN	THREAD_ID	SOCKET_ID	IP	PORT	STATE
+select * from performance_schema.socket_summary_by_event_name;
+EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
+select * from performance_schema.socket_summary_by_instance;
+EVENT_NAME	OBJECT_INSTANCE_BEGIN	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ	SUM_TIMER_READ	MIN_TIMER_READ	AVG_TIMER_READ	MAX_TIMER_READ	SUM_NUMBER_OF_BYTES_READ	COUNT_WRITE	SUM_TIMER_WRITE	MIN_TIMER_WRITE	AVG_TIMER_WRITE	MAX_TIMER_WRITE	SUM_NUMBER_OF_BYTES_WRITE	COUNT_MISC	SUM_TIMER_MISC	MIN_TIMER_MISC	AVG_TIMER_MISC	MAX_TIMER_MISC
+select * from performance_schema.table_handles;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	OWNER_THREAD_ID	OWNER_EVENT_ID	INTERNAL_LOCK	EXTERNAL_LOCK
 select * from performance_schema.threads;
-THREAD_ID	NAME	TYPE	PROCESSLIST_ID	PROCESSLIST_USER	PROCESSLIST_HOST	PROCESSLIST_DB	PROCESSLIST_COMMAND	PROCESSLIST_TIME	PROCESSLIST_STATE	PROCESSLIST_INFO	PARENT_THREAD_ID	ROLE	INSTRUMENTED
+THREAD_ID	NAME	TYPE	PROCESSLIST_ID	PROCESSLIST_USER	PROCESSLIST_HOST	PROCESSLIST_DB	PROCESSLIST_COMMAND	PROCESSLIST_TIME	PROCESSLIST_STATE	PROCESSLIST_INFO	PARENT_THREAD_ID	ROLE	INSTRUMENTED	HISTORY	CONNECTION_TYPE	THREAD_OS_ID
 select * from performance_schema.users;
 USER	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
diff --git a/mysql-test/suite/perfschema/r/start_server_off.result b/mysql-test/suite/perfschema/r/start_server_off.result
index 8c8b8a3a7bb..06af389a857 100644
--- a/mysql-test/suite/perfschema/r/start_server_off.result
+++ b/mysql-test/suite/perfschema/r/start_server_off.result
@@ -11,14 +11,146 @@ count(*)
 select count(*) from performance_schema.setup_consumers;
 count(*)
 0
-select count(*) > 3 from performance_schema.setup_instruments;
-count(*) > 3
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
 0
 select count(*) from performance_schema.setup_timers;
 count(*)
 0
+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	OFF
+performance_schema_accounts_size	100
+performance_schema_digests_size	200
+performance_schema_events_stages_history_long_size	1000
+performance_schema_events_stages_history_size	10
+performance_schema_events_statements_history_long_size	1000
+performance_schema_events_statements_history_size	10
+performance_schema_events_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%";
+select * from information_schema.engines
+where engine = "PERFORMANCE_SCHEMA";
+ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
+PERFORMANCE_SCHEMA	YES	Performance Schema	NO	NO	NO
 show status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
@@ -29,9 +161,15 @@ 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
@@ -41,6 +179,7 @@ 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
@@ -52,21 +191,23 @@ NAME	ENABLED
 select * from performance_schema.setup_instruments;
 NAME	ENABLED	TIMED
 select * from performance_schema.setup_actors;
-HOST	USER	ROLE
+HOST	USER	ROLE	ENABLED	HISTORY
 select * from performance_schema.setup_objects;
 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
 insert into performance_schema.setup_objects values ('TABLE', 'myschema', 'myobject', 'YES', 'YES');
 ERROR HY000: Invalid performance_schema usage
-insert into performance_schema.setup_actors values ('myhost', 'mysuser', 'myrole');
+insert into performance_schema.setup_actors values ('myhost', 'mysuser', 'myrole', 'YES', 'YES');
 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';
 delete from performance_schema.setup_objects;
 select * from performance_schema.setup_actors;
-HOST	USER	ROLE
+HOST	USER	ROLE	ENABLED	HISTORY
 update performance_schema.setup_actors set HOST = 'myhost';
 delete from performance_schema.setup_actors;
 truncate performance_schema.events_stages_history_long;
@@ -74,3 +215,67 @@ truncate performance_schema.events_statements_history_long;
 truncate performance_schema.events_waits_history_long;
 truncate performance_schema.setup_objects;
 truncate performance_schema.setup_actors;
+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
+show session 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
diff --git a/mysql-test/suite/perfschema/r/start_server_on.result b/mysql-test/suite/perfschema/r/start_server_on.result
index cf210c0935c..c64e4f8416d 100644
--- a/mysql-test/suite/perfschema/r/start_server_on.result
+++ b/mysql-test/suite/perfschema/r/start_server_on.result
@@ -10,16 +10,144 @@ 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 status like "performance_schema%";
+show global status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -29,9 +157,15 @@ 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
@@ -41,6 +175,7 @@ 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
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/start_server_zero_digest_sql_length.result b/mysql-test/suite/perfschema/r/start_server_zero_digest_sql_length.result
new file mode 100644
index 00000000000..c21d16fca0b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/start_server_zero_digest_sql_length.result
@@ -0,0 +1,12 @@
+USE performance_schema;
+truncate table events_statements_history_long;
+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;
+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
+74
+####################################
+# QUERYING PS STATEMENT DIGEST
+####################################
+SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
+event_name	digest	digest_text	sql_text
+statement/sql/truncate	NULL	NULL	NULL
+statement/sql/select	NULL	NULL	NULL
diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result
index ba2e5069c9a..1dec89e8120 100644
--- a/mysql-test/suite/perfschema/r/statement_digest.result
+++ b/mysql-test/suite/perfschema/r/statement_digest.result
@@ -1,3 +1,4 @@
+SET sql_mode='NO_ENGINE_SUBSTITUTION';
 ####################################
 # SETUP
 ####################################
@@ -159,3 +160,4 @@ DROP TABLE IF EXISTS t6;
 DROP TABLE IF EXISTS t11;
 DROP TABLE IF EXISTS t12;
 DROP DATABASE IF EXISTS statements_digest;
+SET sql_mode=default;
diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
index 140c26f4edd..9722c371ecf 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
@@ -19,6 +19,9 @@ events_stages_history_long	YES
 events_statements_current	NO
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers2.result b/mysql-test/suite/perfschema/r/statement_digest_consumers2.result
index 54eba51c1ed..b59c4f06808 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers2.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers2.result
@@ -19,6 +19,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
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 1c581085eef..0ac1b5eb3b2 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
@@ -1,8 +1,8 @@
 USE performance_schema;
 truncate table events_statements_summary_by_digest;
-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+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+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+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+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+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+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 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+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+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+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+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+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+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+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+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+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
-511
+594
 ####################################
 # QUERYING PS STATEMENT DIGEST
 ####################################
diff --git a/mysql-test/suite/perfschema/r/statement_program_concurrency.result b/mysql-test/suite/perfschema/r/statement_program_concurrency.result
new file mode 100644
index 00000000000..5635ae6ceea
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/statement_program_concurrency.result
@@ -0,0 +1,117 @@
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history;
+# concurrency check through multi connections
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+CREATE DATABASE db3;
+connect  con1,localhost,root,,db1;
+USE db1;
+CREATE TABLE t1(
+i INT NOT NULL
+);
+LOAD DATA INFILE '../../std_data/wl5766_data.txt' INTO TABLE t1;
+CREATE PROCEDURE proc()
+BEGIN
+INSERT INTO t1 SELECT * FROM t1;
+END|
+CALL proc();;
+connect  con2,localhost,root,,db2;
+USE db2;
+CREATE TABLE t2(
+i INT NOT NULL
+);
+LOAD DATA INFILE '../../std_data/wl5766_data.txt' INTO TABLE t2;
+CREATE FUNCTION addition(x INT, y INT) RETURNS INT
+BEGIN
+INSERT INTO t2 SELECT * FROM t2;
+RETURN x+y;
+END|
+SELECT addition(1234,9876);;
+connect  con3,localhost,root,,db3;
+USE db3;
+CREATE TABLE t(
+i INT NOT NULL,
+j INT
+);
+CREATE TABLE t3(
+i INT NOT NULL
+);
+LOAD DATA INFILE '../../std_data/wl5766_data.txt' INTO TABLE t3;
+INSERT INTO t VALUES ( 10,1000 );
+CREATE TRIGGER trg AFTER INSERT ON t FOR EACH ROW
+INSERT INTO t3 SELECT * FROM t3;
+INSERT INTO t VALUES ( 20,2000);;
+connection con1;
+connection con2;
+addition(1234,9876)
+11110
+connection con3;
+connection default;
+SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='db1' OR OBJECT_SCHEMA='db2' OR OBJECT_SCHEMA='db3'
+       ORDER BY OBJECT_SCHEMA, OBJECT_NAME;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_STATEMENTS
+PROCEDURE	db1	proc	1	1
+FUNCTION	db2	addition	1	2
+TRIGGER	db3	trg	1	1
+SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,
+OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL FROM
+performance_schema.events_statements_history WHERE CURRENT_SCHEMA='db1'
+       OR CURRENT_SCHEMA='db2' OR CURRENT_SCHEMA='db3' 
+ORDER BY CURRENT_SCHEMA, OBJECT_NAME;
+EVENT_NAME	SQL_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
+statement/sql/change_db	USE db1	db1	NULL	NULL	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t1(
+i INT NOT NULL
+)	db1	NULL	NULL	NULL	NULL	0
+statement/sql/load	LOAD DATA INFILE '../../std_data/wl5766_data.txt' INTO TABLE t1	db1	NULL	NULL	NULL	NULL	0
+statement/sql/create_procedure	CREATE PROCEDURE proc()
+BEGIN
+INSERT INTO t1 SELECT * FROM t1;
+END	db1	NULL	NULL	NULL	NULL	0
+statement/sql/call_procedure	CALL proc()	db1	NULL	NULL	NULL	NULL	0
+statement/sp/stmt	INSERT INTO t1 SELECT * FROM t1	db1	PROCEDURE	db1	proc	STATEMENT	1
+statement/sql/change_db	USE db2	db2	NULL	NULL	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t2(
+i INT NOT NULL
+)	db2	NULL	NULL	NULL	NULL	0
+statement/sql/load	LOAD DATA INFILE '../../std_data/wl5766_data.txt' INTO TABLE t2	db2	NULL	NULL	NULL	NULL	0
+statement/sql/create_function	CREATE FUNCTION addition(x INT, y INT) RETURNS INT
+BEGIN
+INSERT INTO t2 SELECT * FROM t2;
+RETURN x+y;
+END	db2	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT addition(1234,9876)	db2	NULL	NULL	NULL	NULL	0
+statement/sp/stmt	INSERT INTO t2 SELECT * FROM t2	db2	FUNCTION	db2	addition	STATEMENT	1
+statement/sp/freturn	NULL	db2	FUNCTION	db2	addition	STATEMENT	1
+statement/sql/change_db	USE db3	db3	NULL	NULL	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t(
+i INT NOT NULL,
+j INT
+)	db3	NULL	NULL	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t3(
+i INT NOT NULL
+)	db3	NULL	NULL	NULL	NULL	0
+statement/sql/load	LOAD DATA INFILE '../../std_data/wl5766_data.txt' INTO TABLE t3	db3	NULL	NULL	NULL	NULL	0
+statement/sql/insert	INSERT INTO t VALUES ( 10,1000 )	db3	NULL	NULL	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg AFTER INSERT ON t FOR EACH ROW
+INSERT INTO t3 SELECT * FROM t3	db3	NULL	NULL	NULL	NULL	0
+statement/sql/insert	INSERT INTO t VALUES ( 20,2000)	db3	NULL	NULL	NULL	NULL	0
+statement/sp/stmt	INSERT INTO t3 SELECT * FROM t3	db3	TRIGGER	db3	trg	STATEMENT	1
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history;
+# Clean-up
+DROP PROCEDURE db1.proc;
+DROP FUNCTION db2.addition;
+DROP TRIGGER db3.trg;
+DROP TABLE db1.t1;
+DROP TABLE db2.t2;
+DROP TABLE db3.t3;
+DROP TABLE db3.t;
+DROP DATABASE db1;
+DROP DATABASE db2;
+DROP DATABASE db3;
+disconnect con1;
+disconnect con2;
+disconnect con3;
diff --git a/mysql-test/suite/perfschema/r/statement_program_lost_inst.result b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result
new file mode 100644
index 00000000000..ebacc9a8f7e
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/statement_program_lost_inst.result
@@ -0,0 +1,335 @@
+show databases;
+Database
+information_schema
+mtr
+mysql
+performance_schema
+test
+select count(*) from performance_schema.performance_timers;
+count(*)
+5
+select count(*) from performance_schema.setup_consumers;
+count(*)
+15
+select count(*) > 4 from performance_schema.setup_instruments;
+count(*) > 4
+1
+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
+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	7
+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	2
+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%";
+show global variables like "performance_schema_max_program_instances";
+Variable_name	Value
+performance_schema_max_program_instances	7
+show global variables like "performance_schema_max_statement_stack";
+Variable_name	Value
+performance_schema_max_statement_stack	2
+##################### 
+# Setup
+##################### 
+# SET-UP
+CREATE DATABASE nested_sp;
+USE nested_sp;
+CREATE TABLE t1(
+id   CHAR(16) NOT NULL DEFAULT '',
+data INT NOT NULL
+);
+CREATE TABLE t2(
+n INT UNSIGNED NOT NULL, 
+f BIGINT UNSIGNED
+) engine=innodb;
+############################
+# Creating Stored Programs #
+############################
+CREATE PROCEDURE c1(x INT)
+CALL c2("c", x)|
+CREATE PROCEDURE c2(s CHAR(16), x INT)
+CALL c3(x, s)|
+CREATE PROCEDURE c3(x INT, s CHAR(16))
+CALL c4("level", x, s)|
+CREATE PROCEDURE c4(l CHAR(8), x INT, s CHAR(16))
+INSERT INTO t1 VALUES (concat(l,s), x)|
+CREATE PROCEDURE iotest(x1 CHAR(16), x2 CHAR(16), y INT)
+BEGIN
+CALL inc2(x2, y);
+INSERT INTO t1 VALUES (x1, y);
+END|
+CREATE PROCEDURE inc2(x CHAR(16), y INT)
+BEGIN
+CALL inc(y);
+INSERT INTO t1 VALUES (x, y);
+END|
+CREATE PROCEDURE inc(inout io INT)
+SET io = io + 1|
+CREATE FUNCTION mul(x INT, y INT) RETURNS INT
+RETURN x*y|
+CREATE FUNCTION inc(i INT) RETURNS INT
+RETURN i+1|
+CREATE FUNCTION fac(n INT UNSIGNED) RETURNS BIGINT UNSIGNED
+BEGIN
+DECLARE f BIGINT UNSIGNED DEFAULT 1;
+WHILE n > 1 DO
+SET f = f * n;
+SET n = n - 1;
+END WHILE;
+RETURN f;
+END|
+CREATE FUNCTION fun(i INT, u INT UNSIGNED) RETURNS DOUBLE
+RETURN mul(inc(i), fac(u))|
+CREATE PROCEDURE ifac(n INT UNSIGNED)
+BEGIN
+DECLARE i BIGINT UNSIGNED DEFAULT 1;
+IF n > 20 THEN
+SET n = 20;         # bigint overflow otherwise
+END IF;
+WHILE i <= n DO
+BEGIN
+INSERT INTO t2 VALUES (i, fac(i));
+SET i = i + 1;
+END;
+END WHILE;
+END|
+CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
+CALL ifac(10)|
+TRUNCATE performance_schema.events_statements_summary_by_program;
+SELECT OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA FROM 
+performance_schema.events_statements_summary_by_program 
+WHERE OBJECT_SCHEMA='nested_sp' ORDER BY OBJECT_NAME;
+OBJECT_TYPE	OBJECT_NAME	OBJECT_SCHEMA
+Flush status;
+show global status like "%performance_schema_program_lost%";
+Variable_name	Value
+Performance_schema_program_lost	0
+show global status like "%performance_schema_nested_statement_lost%";
+Variable_name	Value
+Performance_schema_nested_statement_lost	0
+##################### 
+# Executing Queries
+##################### 
+#####################
+# Executing queries #
+#####################
+CALL c1(42);
+SELECT * FROM t1;
+id	data
+levelc	42
+DELETE FROM t1;
+CALL iotest("io1", "io2", 1);
+SELECT * FROM t1 ORDER BY data DESC;
+id	data
+io2	2
+io1	1
+DELETE FROM t1;
+SELECT fun(6,10);
+fun(6,10)
+25401600
+INSERT INTO t1 VALUES (20,13);
+SELECT * FROM t2;
+n	f
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+###########################################
+# Quering PS statement summary table      #
+########################################### 
+SELECT OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='nested_sp' ORDER BY OBJECT_NAME;
+OBJECT_TYPE	OBJECT_NAME	OBJECT_SCHEMA
+PROCEDURE	c1	nested_sp
+PROCEDURE	c2	nested_sp
+PROCEDURE	c3	nested_sp
+PROCEDURE	c4	nested_sp
+FUNCTION	fac	nested_sp
+PROCEDURE	ifac	nested_sp
+TRIGGER	trg	nested_sp
+show global status like "%performance_schema_program_lost%";
+Variable_name	Value
+Performance_schema_program_lost	6
+show global status like "%performance_schema_nested_statement_lost%";
+Variable_name	Value
+Performance_schema_nested_statement_lost	1062
+##################### 
+# Cleanup
+##################### 
+DROP PROCEDURE c4;
+DROP PROCEDURE c3;
+DROP PROCEDURE c2;
+DROP PROCEDURE c1;
+DROP PROCEDURE inc;
+DROP PROCEDURE inc2;
+DROP PROCEDURE iotest;
+DROP FUNCTION mul;
+DROP FUNCTION inc;
+DROP FUNCTION fac;
+DROP FUNCTION fun;
+DROP PROCEDURE ifac;
+DROP TRIGGER trg;
+DROP TABLE t1,t2;
+DROP DATABASE nested_sp;
diff --git a/mysql-test/suite/perfschema/r/statement_program_nested.result b/mysql-test/suite/perfschema/r/statement_program_nested.result
new file mode 100644
index 00000000000..95cbdc81a1f
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/statement_program_nested.result
@@ -0,0 +1,2333 @@
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+#################################################
+# Quering PS statement summary and history_long #
+#################################################
+# SET-UP
+CREATE DATABASE nested_sp;
+USE nested_sp;
+CREATE TABLE t1(
+id   CHAR(16) NOT NULL DEFAULT '',
+data INT NOT NULL
+);
+CREATE TABLE t2(
+n INT UNSIGNED NOT NULL, 
+f BIGINT UNSIGNED
+) engine=innodb;
+############################
+# Creating Stored Programs #
+############################
+CREATE PROCEDURE c1(x INT)
+CALL c2("c", x)|
+CREATE PROCEDURE c2(s CHAR(16), x INT)
+CALL c3(x, s)|
+CREATE PROCEDURE c3(x INT, s CHAR(16))
+CALL c4("level", x, s)|
+CREATE PROCEDURE c4(l CHAR(8), x INT, s CHAR(16))
+INSERT INTO t1 VALUES (concat(l,s), x)|
+CREATE PROCEDURE iotest(x1 CHAR(16), x2 CHAR(16), y INT)
+BEGIN
+CALL inc2(x2, y);
+INSERT INTO t1 VALUES (x1, y);
+END|
+CREATE PROCEDURE inc2(x CHAR(16), y INT)
+BEGIN
+CALL inc(y);
+INSERT INTO t1 VALUES (x, y);
+END|
+CREATE PROCEDURE inc(inout io INT)
+SET io = io + 1|
+CREATE FUNCTION mul(x INT, y INT) RETURNS INT
+RETURN x*y|
+CREATE FUNCTION inc(i INT) RETURNS INT
+RETURN i+1|
+CREATE FUNCTION fac(n INT UNSIGNED) RETURNS BIGINT UNSIGNED
+BEGIN
+DECLARE f BIGINT UNSIGNED DEFAULT 1;
+WHILE n > 1 DO
+SET f = f * n;
+SET n = n - 1;
+END WHILE;
+RETURN f;
+END|
+CREATE FUNCTION fun(i INT, u INT UNSIGNED) RETURNS DOUBLE
+RETURN mul(inc(i), fac(u))|
+CREATE PROCEDURE ifac(n INT UNSIGNED)
+BEGIN
+DECLARE i BIGINT UNSIGNED DEFAULT 1;
+IF n > 20 THEN
+SET n = 20;         # bigint overflow otherwise
+END IF;
+WHILE i <= n DO
+BEGIN
+INSERT INTO t2 VALUES (i, fac(i));
+SET i = i + 1;
+END;
+END WHILE;
+END|
+CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
+CALL ifac(10)|
+#####################
+# Executing queries #
+#####################
+CALL c1(42);
+SELECT * FROM t1;
+id	data
+levelc	42
+DELETE FROM t1;
+CALL iotest("io1", "io2", 1);
+SELECT * FROM t1 ORDER BY data DESC;
+id	data
+io2	2
+io1	1
+DELETE FROM t1;
+SELECT fun(6,10);
+fun(6,10)
+25401600
+INSERT INTO t1 VALUES (20,13);
+SELECT * FROM t2;
+n	f
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,
+OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL 
+FROM performance_schema.events_statements_history_long WHERE
+CURRENT_SCHEMA='nested_sp' ORDER BY 
+OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT,EVENT_NAME;
+EVENT_NAME	SQL_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
+statement/sql/call_procedure	CALL c1(42)	nested_sp	NULL	NULL	NULL	NULL	0
+statement/sql/call_procedure	CALL iotest("io1", "io2", 1)	nested_sp	NULL	NULL	NULL	NULL	0
+statement/sql/delete	DELETE FROM t1	nested_sp	NULL	NULL	NULL	NULL	0
+statement/sql/delete	DELETE FROM t1	nested_sp	NULL	NULL	NULL	NULL	0
+statement/sql/insert	INSERT INTO t1 VALUES (20,13)	nested_sp	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT * FROM t1	nested_sp	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT * FROM t1 ORDER BY data DESC	nested_sp	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT * FROM t2	nested_sp	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT fun(6,10)	nested_sp	NULL	NULL	NULL	NULL	0
+statement/sp/stmt	CALL c2("c", x)	nested_sp	PROCEDURE	nested_sp	c1	STATEMENT	1
+statement/sp/stmt	CALL c3(x, s)	nested_sp	PROCEDURE	nested_sp	c2	STATEMENT	2
+statement/sp/stmt	CALL c4("level", x, s)	nested_sp	PROCEDURE	nested_sp	c3	STATEMENT	3
+statement/sp/stmt	INSERT INTO t1 VALUES (concat(l,s), x)	nested_sp	PROCEDURE	nested_sp	c4	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	2
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	3
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	4
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	5
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/set	NULL	nested_sp	FUNCTION	nested_sp	fac	STATEMENT	7
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	fun	STATEMENT	1
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	2
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	3
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	4
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	nested_sp	PROCEDURE	nested_sp	ifac	STATEMENT	6
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	inc	STATEMENT	2
+statement/sp/set	NULL	nested_sp	PROCEDURE	nested_sp	inc	STATEMENT	3
+statement/sp/stmt	CALL inc(y)	nested_sp	PROCEDURE	nested_sp	inc2	STATEMENT	2
+statement/sp/stmt	INSERT INTO t1 VALUES (x, y)	nested_sp	PROCEDURE	nested_sp	inc2	STATEMENT	2
+statement/sp/stmt	CALL inc2(x2, y)	nested_sp	PROCEDURE	nested_sp	iotest	STATEMENT	1
+statement/sp/stmt	INSERT INTO t1 VALUES (x1, y)	nested_sp	PROCEDURE	nested_sp	iotest	STATEMENT	1
+statement/sp/freturn	NULL	nested_sp	FUNCTION	nested_sp	mul	STATEMENT	2
+statement/sp/stmt	CALL ifac(10)	nested_sp	TRIGGER	nested_sp	trg	TRANSACTION	1
+statement/sp/stmt	CALL ifac(10)	nested_sp	TRIGGER	nested_sp	trg	TRANSACTION	2
+statement/sp/stmt	CALL ifac(10)	nested_sp	TRIGGER	nested_sp	trg	TRANSACTION	3
+statement/sp/stmt	CALL ifac(10)	nested_sp	TRIGGER	nested_sp	trg	TRANSACTION	5
+SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS 
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='nested_sp' ORDER BY OBJECT_NAME;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_STATEMENTS
+PROCEDURE	nested_sp	c1	1	1
+PROCEDURE	nested_sp	c2	1	1
+PROCEDURE	nested_sp	c3	1	1
+PROCEDURE	nested_sp	c4	1	1
+FUNCTION	nested_sp	fac	41	879
+FUNCTION	nested_sp	fun	1	1
+PROCEDURE	nested_sp	ifac	4	172
+PROCEDURE	nested_sp	inc	1	1
+FUNCTION	nested_sp	inc	1	1
+PROCEDURE	nested_sp	inc2	1	2
+PROCEDURE	nested_sp	iotest	1	2
+FUNCTION	nested_sp	mul	1	1
+TRIGGER	nested_sp	trg	4	4
+# clean-up
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS 
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='nested_sp' ORDER BY OBJECT_NAME;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_STATEMENTS
+PROCEDURE	nested_sp	c1	0	0
+PROCEDURE	nested_sp	c2	0	0
+PROCEDURE	nested_sp	c3	0	0
+PROCEDURE	nested_sp	c4	0	0
+FUNCTION	nested_sp	fac	0	0
+FUNCTION	nested_sp	fun	0	0
+PROCEDURE	nested_sp	ifac	0	0
+PROCEDURE	nested_sp	inc	0	0
+FUNCTION	nested_sp	inc	0	0
+PROCEDURE	nested_sp	inc2	0	0
+PROCEDURE	nested_sp	iotest	0	0
+FUNCTION	nested_sp	mul	0	0
+TRIGGER	nested_sp	trg	0	0
+DROP PROCEDURE c4;
+DROP PROCEDURE c3;
+DROP PROCEDURE c2;
+DROP PROCEDURE c1;
+DROP PROCEDURE inc;
+DROP PROCEDURE inc2;
+DROP PROCEDURE iotest;
+DROP FUNCTION mul;
+DROP FUNCTION inc;
+DROP FUNCTION fac;
+DROP FUNCTION fun;
+DROP PROCEDURE ifac;
+DROP TRIGGER trg;
+DROP TABLE t1,t2;
+DROP DATABASE nested_sp;
+SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS 
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='nested_sp' ORDER BY OBJECT_NAME;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_STATEMENTS
+# SET-UP
+CREATE DATABASE nested_sp;
+USE nested_sp;
+CREATE TABLE t1(
+id   CHAR(16) NOT NULL DEFAULT '',
+data INT NOT NULL
+);
+CREATE TABLE t2(
+n INT UNSIGNED NOT NULL, 
+f BIGINT UNSIGNED
+) engine=innodb;
+############################
+# Creating Stored Programs #
+############################
+CREATE PROCEDURE c1(x INT)
+CALL c2("c", x)|
+CREATE PROCEDURE c2(s CHAR(16), x INT)
+CALL c3(x, s)|
+CREATE PROCEDURE c3(x INT, s CHAR(16))
+CALL c4("level", x, s)|
+CREATE PROCEDURE c4(l CHAR(8), x INT, s CHAR(16))
+INSERT INTO t1 VALUES (concat(l,s), x)|
+CREATE PROCEDURE iotest(x1 CHAR(16), x2 CHAR(16), y INT)
+BEGIN
+CALL inc2(x2, y);
+INSERT INTO t1 VALUES (x1, y);
+END|
+CREATE PROCEDURE inc2(x CHAR(16), y INT)
+BEGIN
+CALL inc(y);
+INSERT INTO t1 VALUES (x, y);
+END|
+CREATE PROCEDURE inc(inout io INT)
+SET io = io + 1|
+CREATE FUNCTION mul(x INT, y INT) RETURNS INT
+RETURN x*y|
+CREATE FUNCTION inc(i INT) RETURNS INT
+RETURN i+1|
+CREATE FUNCTION fac(n INT UNSIGNED) RETURNS BIGINT UNSIGNED
+BEGIN
+DECLARE f BIGINT UNSIGNED DEFAULT 1;
+WHILE n > 1 DO
+SET f = f * n;
+SET n = n - 1;
+END WHILE;
+RETURN f;
+END|
+CREATE FUNCTION fun(i INT, u INT UNSIGNED) RETURNS DOUBLE
+RETURN mul(inc(i), fac(u))|
+CREATE PROCEDURE ifac(n INT UNSIGNED)
+BEGIN
+DECLARE i BIGINT UNSIGNED DEFAULT 1;
+IF n > 20 THEN
+SET n = 20;         # bigint overflow otherwise
+END IF;
+WHILE i <= n DO
+BEGIN
+INSERT INTO t2 VALUES (i, fac(i));
+SET i = i + 1;
+END;
+END WHILE;
+END|
+CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
+CALL ifac(10)|
+update performance_schema.setup_instruments set enabled='YES', timed='NO'
+  where name like "statement/sp/%" order by name;
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+#####################
+# Executing queries #
+#####################
+CALL c1(42);
+SELECT * FROM t1;
+id	data
+levelc	42
+DELETE FROM t1;
+CALL iotest("io1", "io2", 1);
+SELECT * FROM t1 ORDER BY data DESC;
+id	data
+io2	2
+io1	1
+DELETE FROM t1;
+SELECT fun(6,10);
+fun(6,10)
+25401600
+INSERT INTO t1 VALUES (20,13);
+SELECT * FROM t2;
+n	f
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+SELECT EVENT_NAME, TIMER_START, TIMER_END, TIMER_WAIT FROM 
+performance_schema.events_statements_history_long WHERE
+CURRENT_SCHEMA='nested_sp' AND EVENT_NAME like "statement/sp/%";
+EVENT_NAME	TIMER_START	TIMER_END	TIMER_WAIT
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+update performance_schema.setup_instruments set enabled='YES', timed='YES'
+  where name like "statement/sp/%" order by name;
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+DROP PROCEDURE c4;
+DROP PROCEDURE c3;
+DROP PROCEDURE c2;
+DROP PROCEDURE c1;
+DROP PROCEDURE inc;
+DROP PROCEDURE inc2;
+DROP PROCEDURE iotest;
+DROP FUNCTION mul;
+DROP FUNCTION inc;
+DROP FUNCTION fac;
+DROP FUNCTION fun;
+DROP PROCEDURE ifac;
+DROP TRIGGER trg;
+DROP TABLE t1,t2;
+DROP DATABASE nested_sp;
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
new file mode 100644
index 00000000000..a17dc30632d
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result
@@ -0,0 +1,1514 @@
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+#----------------------------
+# Non-nested Stored programs.
+#----------------------------
+# SET-UP 
+CREATE DATABASE stored_programs;
+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,
+f DOUBLE,
+s VARCHAR(32)
+);
+CREATE TABLE t4(
+`k` int(10) unsigned NOT NULL AUTO_INCREMENT,
+`word` varchar(100) NOT NULL,
+`mean` varchar(300) NOT NULL,
+PRIMARY KEY (`k`)
+);
+############################
+# Creating Stored Programs #
+############################
+# Stored Routine ( Procedure & Function )
+CREATE PROCEDURE SampleProc1(x1 INT, x2 INT, y INT)
+BEGIN
+INSERT INTO t1 VALUES (x1, y);
+INSERT INTO t1 VALUES (x2, y);
+END|
+CREATE PROCEDURE SampleProc2(x CHAR(16), y INT)
+BEGIN
+DECLARE z1, z2 INT;
+SET z1 = y;
+SET z2 = z1+2;
+INSERT INTO t2 VALUES (x, z2);
+END|
+CREATE PROCEDURE SampleProc3()
+BEGIN
+DECLARE ld DATE;
+DECLARE li INT;
+DECLARE lf DOUBLE;
+DECLARE ls VARCHAR(32);
+SET ld = NULL, li = NULL, lf = NULL, ls = NULL;
+INSERT INTO t3 VALUES (ld, li, lf, ls);
+INSERT INTO t3 (n, f, s) VALUES ((ld IS NULL), 1,    "ld is null"),
+((li IS NULL), 1,    "li is null"),
+((li = 0),     NULL, "li = 0"),
+((lf IS NULL), 1,    "lf is null"),
+((lf = 0),     NULL, "lf = 0"),
+((ls IS NULL), 1,    "ls is null");
+END|
+CREATE PROCEDURE SampleProc4()
+BEGIN
+DECLARE x  INT;
+SET x = 1;
+WHILE x  <= 2 DO
+INSERT INTO t4(word, mean) VALUES('a','a mean');
+SET  x = x + 1;
+END WHILE;
+END|
+CREATE FUNCTION append(s1 CHAR(8), s2 CHAR(8)) RETURNS CHAR(16)
+RETURN concat(s1, s2)|
+CREATE FUNCTION wt_avg(n1 INT, n2 INT, n3 INT, n4 INT)
+RETURNS INT
+DETERMINISTIC
+BEGIN
+DECLARE avg INT;
+SET avg = (n1+n2+n3*2+n4*4)/8;
+RETURN avg;
+END|
+CREATE FUNCTION fac(n INT UNSIGNED) RETURNS BIGINT UNSIGNED
+BEGIN
+DECLARE f BIGINT UNSIGNED DEFAULT 1;
+WHILE n > 1 DO
+SET f = f * n;
+SET n = n - 1;
+END WHILE;
+RETURN f;
+END|
+# Triggers
+CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+if isnull(new.j) then
+SET new.j:= new.i * 10;
+END if;
+END|
+CREATE TRIGGER trg2 AFTER INSERT ON t2 FOR EACH ROW
+BEGIN
+UPDATE t1 SET i=new.id+i ;
+END|
+CREATE TRIGGER trg3 AFTER UPDATE ON t2 FOR EACH ROW
+SET @change:= @change + new.id - old.id|
+CREATE TRIGGER trg4 BEFORE DELETE ON t1 FOR EACH ROW
+SET @del:= @del + 1|
+CREATE TRIGGER trg5 AFTER DELETE ON t1 FOR EACH ROW 
+SET @del:= @del + 8 + old.j|
+#####################
+# Executing queries #
+#####################
+INSERT INTO t1 VALUES (10,20);
+CALL SampleProc1(30,40,50);
+SET @a=1;
+SELECT @a;
+@a
+1
+CALL SampleProc2("Jwalamukhi",34);
+SELECT @a;
+@a
+1
+CALL SampleProc3();
+CALL SampleProc4();
+SET @change=1;
+SELECT @change;
+@change
+1
+UPDATE t2 SET id=22 WHERE name="Jwalamukhi";
+SELECT @change;
+@change
+-13
+SET @del=1;
+SELECT @del;
+@del
+1
+DELETE FROM t1 WHERE i=76;
+SELECT @del;
+@del
+60
+SELECT wt_avg(1, 12, 1990, 1121990);
+wt_avg(1, 12, 1990, 1121990)
+561494
+SELECT fac(5);
+fac(5)
+120
+SELECT append("Bolly", "wood");
+append("Bolly", "wood")
+Bollywood
+# Event
+SET GLOBAL event_scheduler=ON;
+CREATE TABLE table_t(a INT);
+CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
+BEGIN
+INSERT INTO table_t VALUES(1);
+END|
+SELECT * FROM table_t;
+a
+1
+SET GLOBAL event_scheduler=OFF;
+SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL
+FROM performance_schema.events_statements_history_long 
+WHERE CURRENT_SCHEMA='stored_programs' AND
+(SQL_TEXT not like '%count(*) = 1%' OR SQL_TEXT IS NULL)
+ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT;
+EVENT_NAME	SQL_TEXT	OBJECT_NAME	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
+statement/scheduler/event	NULL	NULL	NULL	0
+statement/sql/call_procedure	CALL SampleProc1(30,40,50)	NULL	NULL	0
+statement/sql/call_procedure	CALL SampleProc2("Jwalamukhi",34)	NULL	NULL	0
+statement/sql/call_procedure	CALL SampleProc3()	NULL	NULL	0
+statement/sql/call_procedure	CALL SampleProc4()	NULL	NULL	0
+statement/sql/create_event	CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
+BEGIN
+INSERT INTO table_t VALUES(1);
+END	NULL	NULL	0
+statement/sql/create_function	CREATE FUNCTION append(s1 CHAR(8), s2 CHAR(8)) RETURNS CHAR(16)
+RETURN concat(s1, s2)	NULL	NULL	0
+statement/sql/create_function	CREATE FUNCTION fac(n INT UNSIGNED) RETURNS BIGINT UNSIGNED
+BEGIN
+DECLARE f BIGINT UNSIGNED DEFAULT 1;
+WHILE n > 1 DO
+SET f = f * n;
+SET n = n - 1;
+END WHILE;
+RETURN f;
+END	NULL	NULL	0
+statement/sql/create_function	CREATE FUNCTION wt_avg(n1 INT, n2 INT, n3 INT, n4 INT)
+RETURNS INT
+DETERMINISTIC
+BEGIN
+DECLARE avg INT;
+SET avg = (n1+n2+n3*2+n4*4)/8;
+RETURN avg;
+END	NULL	NULL	0
+statement/sql/create_procedure	CREATE PROCEDURE SampleProc1(x1 INT, x2 INT, y INT)
+BEGIN
+INSERT INTO t1 VALUES (x1, y);
+INSERT INTO t1 VALUES (x2, y);
+END	NULL	NULL	0
+statement/sql/create_procedure	CREATE PROCEDURE SampleProc2(x CHAR(16), y INT)
+BEGIN
+DECLARE z1, z2 INT;
+SET z1 = y;
+SET z2 = z1+2;
+INSERT INTO t2 VALUES (x, z2);
+END	NULL	NULL	0
+statement/sql/create_procedure	CREATE PROCEDURE SampleProc3()
+BEGIN
+DECLARE ld DATE;
+DECLARE li INT;
+DECLARE lf DOUBLE;
+DECLARE ls VARCHAR(32);
+SET ld = NULL, li = NULL, lf = NULL, ls = NULL;
+INSERT INTO t3 VALUES (ld, li, lf, ls);
+INSERT INTO t3 (n, f, s) VALUES ((ld IS NULL), 1,    "ld is null"),
+((li IS NULL), 1,    "li is null"),
+((li = 0),     NULL, "li = 0"),
+((lf IS NULL), 1,    "lf is null"),
+((lf = 0),     NULL, "lf = 0"),
+((ls IS NULL), 1,    "ls is null");
+END	NULL	NULL	0
+statement/sql/create_procedure	CREATE PROCEDURE SampleProc4()
+BEGIN
+DECLARE x  INT;
+SET x = 1;
+WHILE x  <= 2 DO
+INSERT INTO t4(word, mean) VALUES('a','a mean');
+SET  x = x + 1;
+END WHILE;
+END	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t1(
+i INT NOT NULL,
+j INT
+) engine=innodb	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t2(
+name   CHAR(16) NOT NULL DEFAULT '',
+id INT NOT NULL
+) engine=innodb	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t3(
+d DATE,
+n INT,
+f DOUBLE,
+s VARCHAR(32)
+)	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t4(
+`k` int(10) unsigned NOT NULL AUTO_INCREMENT,
+`word` varchar(100) NOT NULL,
+`mean` varchar(300) NOT NULL,
+PRIMARY KEY (`k`)
+)	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE table_t(a INT)	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+if isnull(new.j) then
+SET new.j:= new.i * 10;
+END if;
+END	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg2 AFTER INSERT ON t2 FOR EACH ROW
+BEGIN
+UPDATE t1 SET i=new.id+i ;
+END	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg3 AFTER UPDATE ON t2 FOR EACH ROW
+SET @change:= @change + new.id - old.id	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg4 BEFORE DELETE ON t1 FOR EACH ROW
+SET @del:= @del + 1	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg5 AFTER DELETE ON t1 FOR EACH ROW 
+SET @del:= @del + 8 + old.j	NULL	NULL	0
+statement/sql/delete	DELETE FROM t1 WHERE i=76	NULL	NULL	0
+statement/sql/insert	INSERT INTO t1 VALUES (10,20)	NULL	NULL	0
+statement/sql/select	SELECT * FROM table_t	NULL	NULL	0
+statement/sql/select	SELECT 5 * 10	NULL	NULL	0
+statement/sql/select	SELECT @a	NULL	NULL	0
+statement/sql/select	SELECT @a	NULL	NULL	0
+statement/sql/select	SELECT @change	NULL	NULL	0
+statement/sql/select	SELECT @change	NULL	NULL	0
+statement/sql/select	SELECT @del	NULL	NULL	0
+statement/sql/select	SELECT @del	NULL	NULL	0
+statement/sql/select	SELECT append("Bolly", "wood")	NULL	NULL	0
+statement/sql/select	SELECT COUNT(*) = 0 FROM information_schema.processlist
+WHERE user = 'event_scheduler'	NULL	NULL	0
+statement/sql/select	SELECT fac(5)	NULL	NULL	0
+statement/sql/select	SELECT wt_avg(1, 12, 1990, 1121990)	NULL	NULL	0
+statement/sql/set_option	SET @a=1	NULL	NULL	0
+statement/sql/set_option	SET @change=1	NULL	NULL	0
+statement/sql/set_option	SET @del=1	NULL	NULL	0
+statement/sql/set_option	SET GLOBAL event_scheduler=OFF	NULL	NULL	0
+statement/sql/set_option	SET GLOBAL event_scheduler=ON	NULL	NULL	0
+statement/sql/update	UPDATE t2 SET id=22 WHERE name="Jwalamukhi"	NULL	NULL	0
+statement/sp/freturn	NULL	append	STATEMENT	1
+statement/sp/stmt	INSERT INTO table_t VALUES(1)	e1	STATEMENT	1
+statement/sp/set	NULL	fac	STATEMENT	1
+statement/sp/jump_if_not	NULL	fac	STATEMENT	1
+statement/sp/set	NULL	fac	STATEMENT	1
+statement/sp/set	NULL	fac	STATEMENT	1
+statement/sp/jump	NULL	fac	STATEMENT	1
+statement/sp/jump_if_not	NULL	fac	STATEMENT	1
+statement/sp/set	NULL	fac	STATEMENT	1
+statement/sp/set	NULL	fac	STATEMENT	1
+statement/sp/jump	NULL	fac	STATEMENT	1
+statement/sp/jump_if_not	NULL	fac	STATEMENT	1
+statement/sp/set	NULL	fac	STATEMENT	1
+statement/sp/set	NULL	fac	STATEMENT	1
+statement/sp/jump	NULL	fac	STATEMENT	1
+statement/sp/jump_if_not	NULL	fac	STATEMENT	1
+statement/sp/set	NULL	fac	STATEMENT	1
+statement/sp/set	NULL	fac	STATEMENT	1
+statement/sp/jump	NULL	fac	STATEMENT	1
+statement/sp/jump_if_not	NULL	fac	STATEMENT	1
+statement/sp/freturn	NULL	fac	STATEMENT	1
+statement/sp/stmt	INSERT INTO t1 VALUES (x1, y)	sampleproc1	STATEMENT	1
+statement/sp/stmt	INSERT INTO t1 VALUES (x2, y)	sampleproc1	STATEMENT	1
+statement/sp/set	NULL	sampleproc2	STATEMENT	1
+statement/sp/set	NULL	sampleproc2	STATEMENT	1
+statement/sp/set	NULL	sampleproc2	STATEMENT	1
+statement/sp/set	NULL	sampleproc2	STATEMENT	1
+statement/sp/stmt	INSERT INTO t2 VALUES (x, z2)	sampleproc2	STATEMENT	1
+statement/sp/set	NULL	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	sampleproc3	STATEMENT	1
+statement/sp/stmt	INSERT INTO t3 (n, f, s) VALUES ((ld IS NULL), 1,    "ld is null"),
+((li IS NULL), 1,    "li is null"),
+((li = 0),     NULL, "li = 0"),
+((lf IS NULL), 1,    "lf is null"),
+((lf = 0),     NULL, "lf = 0"),
+((ls IS NULL), 1,    "ls is null")	sampleproc3	STATEMENT	1
+statement/sp/stmt	INSERT INTO t3 VALUES (ld, li, lf, ls)	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	sampleproc4	STATEMENT	1
+statement/sp/set	NULL	sampleproc4	STATEMENT	1
+statement/sp/jump_if_not	NULL	sampleproc4	STATEMENT	1
+statement/sp/set	NULL	sampleproc4	STATEMENT	1
+statement/sp/jump	NULL	sampleproc4	STATEMENT	1
+statement/sp/jump_if_not	NULL	sampleproc4	STATEMENT	1
+statement/sp/set	NULL	sampleproc4	STATEMENT	1
+statement/sp/jump	NULL	sampleproc4	STATEMENT	1
+statement/sp/jump_if_not	NULL	sampleproc4	STATEMENT	1
+statement/sp/stmt	INSERT INTO t4(word, mean) VALUES('a','a mean')	sampleproc4	STATEMENT	1
+statement/sp/stmt	INSERT INTO t4(word, mean) VALUES('a','a mean')	sampleproc4	STATEMENT	1
+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	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
+statement/sp/set	NULL	wt_avg	STATEMENT	1
+statement/sp/set	NULL	wt_avg	STATEMENT	1
+statement/sp/freturn	NULL	wt_avg	STATEMENT	1
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+DROP PROCEDURE SampleProc1;
+DROP PROCEDURE SampleProc2;
+DROP PROCEDURE SampleProc3;
+DROP PROCEDURE SampleProc4;
+DROP FUNCTION wt_avg;
+DROP FUNCTION fac;
+DROP FUNCTION append;
+DROP TRIGGER trg1;
+DROP TRIGGER trg2;
+DROP TRIGGER trg3;
+DROP TRIGGER trg4;
+DROP TRIGGER trg5;
+DROP EVENT IF EXISTS e1;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+DROP TABLE table_t;
+DROP DATABASE stored_programs;
+#------------------------
+# Nested stored programs.
+#------------------------
+# SET-UP
+CREATE DATABASE nested_sp;
+USE nested_sp;
+CREATE TABLE t1(
+id   CHAR(16) NOT NULL DEFAULT '',
+data INT NOT NULL
+);
+CREATE TABLE t2(
+n INT UNSIGNED NOT NULL, 
+f BIGINT UNSIGNED
+) engine=innodb;
+############################
+# Creating Stored Programs #
+############################
+CREATE PROCEDURE c1(x INT)
+CALL c2("c", x)|
+CREATE PROCEDURE c2(s CHAR(16), x INT)
+CALL c3(x, s)|
+CREATE PROCEDURE c3(x INT, s CHAR(16))
+CALL c4("level", x, s)|
+CREATE PROCEDURE c4(l CHAR(8), x INT, s CHAR(16))
+INSERT INTO t1 VALUES (concat(l,s), x)|
+CREATE PROCEDURE iotest(x1 CHAR(16), x2 CHAR(16), y INT)
+BEGIN
+CALL inc2(x2, y);
+INSERT INTO t1 VALUES (x1, y);
+END|
+CREATE PROCEDURE inc2(x CHAR(16), y INT)
+BEGIN
+CALL inc(y);
+INSERT INTO t1 VALUES (x, y);
+END|
+CREATE PROCEDURE inc(inout io INT)
+SET io = io + 1|
+CREATE FUNCTION mul(x INT, y INT) RETURNS INT
+RETURN x*y|
+CREATE FUNCTION inc(i INT) RETURNS INT
+RETURN i+1|
+CREATE FUNCTION fac(n INT UNSIGNED) RETURNS BIGINT UNSIGNED
+BEGIN
+DECLARE f BIGINT UNSIGNED DEFAULT 1;
+WHILE n > 1 DO
+SET f = f * n;
+SET n = n - 1;
+END WHILE;
+RETURN f;
+END|
+CREATE FUNCTION fun(i INT, u INT UNSIGNED) RETURNS DOUBLE
+RETURN mul(inc(i), fac(u))|
+CREATE PROCEDURE ifac(n INT UNSIGNED)
+BEGIN
+DECLARE i BIGINT UNSIGNED DEFAULT 1;
+IF n > 20 THEN
+SET n = 20;         # bigint overflow otherwise
+END IF;
+WHILE i <= n DO
+BEGIN
+INSERT INTO t2 VALUES (i, fac(i));
+SET i = i + 1;
+END;
+END WHILE;
+END|
+CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
+CALL ifac(10)|
+#####################
+# Executing queries #
+#####################
+CALL c1(42);
+SELECT * FROM t1;
+id	data
+levelc	42
+DELETE FROM t1;
+CALL iotest("io1", "io2", 1);
+SELECT * FROM t1 ORDER BY data DESC;
+id	data
+io2	2
+io1	1
+DELETE FROM t1;
+SELECT fun(6,10);
+fun(6,10)
+25401600
+INSERT INTO t1 VALUES (20,13);
+SELECT * FROM t2;
+n	f
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+1	1
+2	2
+3	6
+4	24
+5	120
+6	720
+7	5040
+8	40320
+9	362880
+10	3628800
+SELECT EVENT_NAME, SQL_TEXT, OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL
+FROM performance_schema.events_statements_history_long 
+WHERE CURRENT_SCHEMA='nested_sp' 
+ORDER BY OBJECT_NAME, NESTING_EVENT_LEVEL, SQL_TEXT, EVENT_NAME;
+EVENT_NAME	SQL_TEXT	OBJECT_NAME	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
+statement/sql/call_procedure	CALL c1(42)	NULL	NULL	0
+statement/sql/call_procedure	CALL iotest("io1", "io2", 1)	NULL	NULL	0
+statement/sql/delete	DELETE FROM t1	NULL	NULL	0
+statement/sql/delete	DELETE FROM t1	NULL	NULL	0
+statement/sql/insert	INSERT INTO t1 VALUES (20,13)	NULL	NULL	0
+statement/sql/select	SELECT * FROM t1	NULL	NULL	0
+statement/sql/select	SELECT * FROM t1 ORDER BY data DESC	NULL	NULL	0
+statement/sql/select	SELECT * FROM t2	NULL	NULL	0
+statement/sql/select	SELECT fun(6,10)	NULL	NULL	0
+statement/sp/stmt	CALL c2("c", x)	c1	STATEMENT	1
+statement/sp/stmt	CALL c3(x, s)	c2	STATEMENT	2
+statement/sp/stmt	CALL c4("level", x, s)	c3	STATEMENT	3
+statement/sp/stmt	INSERT INTO t1 VALUES (concat(l,s), x)	c4	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	2
+statement/sp/jump	NULL	fac	STATEMENT	2
+statement/sp/jump	NULL	fac	STATEMENT	2
+statement/sp/jump	NULL	fac	STATEMENT	2
+statement/sp/jump	NULL	fac	STATEMENT	2
+statement/sp/jump	NULL	fac	STATEMENT	2
+statement/sp/jump	NULL	fac	STATEMENT	2
+statement/sp/jump	NULL	fac	STATEMENT	2
+statement/sp/jump	NULL	fac	STATEMENT	2
+statement/sp/jump	NULL	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	fac	STATEMENT	2
+statement/sp/jump_if_not	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/set	NULL	fac	STATEMENT	2
+statement/sp/freturn	NULL	fac	STATEMENT	3
+statement/sp/freturn	NULL	fac	STATEMENT	3
+statement/sp/freturn	NULL	fac	STATEMENT	3
+statement/sp/freturn	NULL	fac	STATEMENT	3
+statement/sp/freturn	NULL	fac	STATEMENT	3
+statement/sp/freturn	NULL	fac	STATEMENT	3
+statement/sp/freturn	NULL	fac	STATEMENT	3
+statement/sp/freturn	NULL	fac	STATEMENT	3
+statement/sp/freturn	NULL	fac	STATEMENT	3
+statement/sp/freturn	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/jump_if_not	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/set	NULL	fac	STATEMENT	3
+statement/sp/freturn	NULL	fac	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/jump_if_not	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/set	NULL	fac	STATEMENT	4
+statement/sp/freturn	NULL	fac	STATEMENT	5
+statement/sp/freturn	NULL	fac	STATEMENT	5
+statement/sp/freturn	NULL	fac	STATEMENT	5
+statement/sp/freturn	NULL	fac	STATEMENT	5
+statement/sp/freturn	NULL	fac	STATEMENT	5
+statement/sp/freturn	NULL	fac	STATEMENT	5
+statement/sp/freturn	NULL	fac	STATEMENT	5
+statement/sp/freturn	NULL	fac	STATEMENT	5
+statement/sp/freturn	NULL	fac	STATEMENT	5
+statement/sp/freturn	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/jump_if_not	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/set	NULL	fac	STATEMENT	5
+statement/sp/freturn	NULL	fac	STATEMENT	7
+statement/sp/freturn	NULL	fac	STATEMENT	7
+statement/sp/freturn	NULL	fac	STATEMENT	7
+statement/sp/freturn	NULL	fac	STATEMENT	7
+statement/sp/freturn	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/jump_if_not	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/set	NULL	fac	STATEMENT	7
+statement/sp/freturn	NULL	fun	STATEMENT	1
+statement/sp/jump	NULL	ifac	STATEMENT	2
+statement/sp/jump	NULL	ifac	STATEMENT	2
+statement/sp/jump	NULL	ifac	STATEMENT	2
+statement/sp/jump	NULL	ifac	STATEMENT	2
+statement/sp/jump	NULL	ifac	STATEMENT	2
+statement/sp/jump	NULL	ifac	STATEMENT	2
+statement/sp/jump	NULL	ifac	STATEMENT	2
+statement/sp/jump	NULL	ifac	STATEMENT	2
+statement/sp/jump	NULL	ifac	STATEMENT	2
+statement/sp/jump	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/set	NULL	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	2
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	2
+statement/sp/jump	NULL	ifac	STATEMENT	3
+statement/sp/jump	NULL	ifac	STATEMENT	3
+statement/sp/jump	NULL	ifac	STATEMENT	3
+statement/sp/jump	NULL	ifac	STATEMENT	3
+statement/sp/jump	NULL	ifac	STATEMENT	3
+statement/sp/jump	NULL	ifac	STATEMENT	3
+statement/sp/jump	NULL	ifac	STATEMENT	3
+statement/sp/jump	NULL	ifac	STATEMENT	3
+statement/sp/jump	NULL	ifac	STATEMENT	3
+statement/sp/jump	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/set	NULL	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	3
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	3
+statement/sp/jump	NULL	ifac	STATEMENT	4
+statement/sp/jump	NULL	ifac	STATEMENT	4
+statement/sp/jump	NULL	ifac	STATEMENT	4
+statement/sp/jump	NULL	ifac	STATEMENT	4
+statement/sp/jump	NULL	ifac	STATEMENT	4
+statement/sp/jump	NULL	ifac	STATEMENT	4
+statement/sp/jump	NULL	ifac	STATEMENT	4
+statement/sp/jump	NULL	ifac	STATEMENT	4
+statement/sp/jump	NULL	ifac	STATEMENT	4
+statement/sp/jump	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/set	NULL	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	4
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	4
+statement/sp/jump	NULL	ifac	STATEMENT	6
+statement/sp/jump	NULL	ifac	STATEMENT	6
+statement/sp/jump	NULL	ifac	STATEMENT	6
+statement/sp/jump	NULL	ifac	STATEMENT	6
+statement/sp/jump	NULL	ifac	STATEMENT	6
+statement/sp/jump	NULL	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	6
+statement/sp/jump_if_not	NULL	ifac	STATEMENT	6
+statement/sp/set	NULL	ifac	STATEMENT	6
+statement/sp/set	NULL	ifac	STATEMENT	6
+statement/sp/set	NULL	ifac	STATEMENT	6
+statement/sp/set	NULL	ifac	STATEMENT	6
+statement/sp/set	NULL	ifac	STATEMENT	6
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	6
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	6
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	6
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	6
+statement/sp/stmt	INSERT INTO t2 VALUES (i, fac(i))	ifac	STATEMENT	6
+statement/sp/freturn	NULL	inc	STATEMENT	2
+statement/sp/set	NULL	inc	STATEMENT	3
+statement/sp/stmt	CALL inc(y)	inc2	STATEMENT	2
+statement/sp/stmt	INSERT INTO t1 VALUES (x, y)	inc2	STATEMENT	2
+statement/sp/stmt	CALL inc2(x2, y)	iotest	STATEMENT	1
+statement/sp/stmt	INSERT INTO t1 VALUES (x1, y)	iotest	STATEMENT	1
+statement/sp/freturn	NULL	mul	STATEMENT	2
+statement/sp/stmt	CALL ifac(10)	trg	TRANSACTION	1
+statement/sp/stmt	CALL ifac(10)	trg	TRANSACTION	2
+statement/sp/stmt	CALL ifac(10)	trg	TRANSACTION	3
+statement/sp/stmt	CALL ifac(10)	trg	TRANSACTION	5
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+DROP PROCEDURE c4;
+DROP PROCEDURE c3;
+DROP PROCEDURE c2;
+DROP PROCEDURE c1;
+DROP PROCEDURE inc;
+DROP PROCEDURE inc2;
+DROP PROCEDURE iotest;
+DROP FUNCTION mul;
+DROP FUNCTION inc;
+DROP FUNCTION fac;
+DROP FUNCTION fun;
+DROP PROCEDURE ifac;
+DROP TRIGGER trg;
+DROP TABLE t1,t2;
+DROP DATABASE nested_sp;
diff --git a/mysql-test/suite/perfschema/r/statement_program_non_nested.result b/mysql-test/suite/perfschema/r/statement_program_non_nested.result
new file mode 100644
index 00000000000..b7de4b84132
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/statement_program_non_nested.result
@@ -0,0 +1,706 @@
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+################################################
+# Quering PS statement summary and history_long#
+################################################ 
+# SET-UP 
+CREATE DATABASE stored_programs;
+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,
+f DOUBLE,
+s VARCHAR(32)
+);
+CREATE TABLE t4(
+`k` int(10) unsigned NOT NULL AUTO_INCREMENT,
+`word` varchar(100) NOT NULL,
+`mean` varchar(300) NOT NULL,
+PRIMARY KEY (`k`)
+);
+############################
+# Creating Stored Programs #
+############################
+# Stored Routine ( Procedure & Function )
+CREATE PROCEDURE SampleProc1(x1 INT, x2 INT, y INT)
+BEGIN
+INSERT INTO t1 VALUES (x1, y);
+INSERT INTO t1 VALUES (x2, y);
+END|
+CREATE PROCEDURE SampleProc2(x CHAR(16), y INT)
+BEGIN
+DECLARE z1, z2 INT;
+SET z1 = y;
+SET z2 = z1+2;
+INSERT INTO t2 VALUES (x, z2);
+END|
+CREATE PROCEDURE SampleProc3()
+BEGIN
+DECLARE ld DATE;
+DECLARE li INT;
+DECLARE lf DOUBLE;
+DECLARE ls VARCHAR(32);
+SET ld = NULL, li = NULL, lf = NULL, ls = NULL;
+INSERT INTO t3 VALUES (ld, li, lf, ls);
+INSERT INTO t3 (n, f, s) VALUES ((ld IS NULL), 1,    "ld is null"),
+((li IS NULL), 1,    "li is null"),
+((li = 0),     NULL, "li = 0"),
+((lf IS NULL), 1,    "lf is null"),
+((lf = 0),     NULL, "lf = 0"),
+((ls IS NULL), 1,    "ls is null");
+END|
+CREATE PROCEDURE SampleProc4()
+BEGIN
+DECLARE x  INT;
+SET x = 1;
+WHILE x  <= 2 DO
+INSERT INTO t4(word, mean) VALUES('a','a mean');
+SET  x = x + 1;
+END WHILE;
+END|
+CREATE FUNCTION append(s1 CHAR(8), s2 CHAR(8)) RETURNS CHAR(16)
+RETURN concat(s1, s2)|
+CREATE FUNCTION wt_avg(n1 INT, n2 INT, n3 INT, n4 INT)
+RETURNS INT
+DETERMINISTIC
+BEGIN
+DECLARE avg INT;
+SET avg = (n1+n2+n3*2+n4*4)/8;
+RETURN avg;
+END|
+CREATE FUNCTION fac(n INT UNSIGNED) RETURNS BIGINT UNSIGNED
+BEGIN
+DECLARE f BIGINT UNSIGNED DEFAULT 1;
+WHILE n > 1 DO
+SET f = f * n;
+SET n = n - 1;
+END WHILE;
+RETURN f;
+END|
+# Triggers
+CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+if isnull(new.j) then
+SET new.j:= new.i * 10;
+END if;
+END|
+CREATE TRIGGER trg2 AFTER INSERT ON t2 FOR EACH ROW
+BEGIN
+UPDATE t1 SET i=new.id+i ;
+END|
+CREATE TRIGGER trg3 AFTER UPDATE ON t2 FOR EACH ROW
+SET @change:= @change + new.id - old.id|
+CREATE TRIGGER trg4 BEFORE DELETE ON t1 FOR EACH ROW
+SET @del:= @del + 1|
+CREATE TRIGGER trg5 AFTER DELETE ON t1 FOR EACH ROW 
+SET @del:= @del + 8 + old.j|
+#####################
+# Executing queries #
+#####################
+INSERT INTO t1 VALUES (10,20);
+CALL SampleProc1(30,40,50);
+SET @a=1;
+SELECT @a;
+@a
+1
+CALL SampleProc2("Jwalamukhi",34);
+SELECT @a;
+@a
+1
+CALL SampleProc3();
+CALL SampleProc4();
+SET @change=1;
+SELECT @change;
+@change
+1
+UPDATE t2 SET id=22 WHERE name="Jwalamukhi";
+SELECT @change;
+@change
+-13
+SET @del=1;
+SELECT @del;
+@del
+1
+DELETE FROM t1 WHERE i=76;
+SELECT @del;
+@del
+60
+SELECT wt_avg(1, 12, 1990, 1121990);
+wt_avg(1, 12, 1990, 1121990)
+561494
+SELECT fac(5);
+fac(5)
+120
+SELECT append("Bolly", "wood");
+append("Bolly", "wood")
+Bollywood
+# Event
+SET GLOBAL event_scheduler=ON;
+CREATE TABLE table_t(a INT);
+CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
+BEGIN
+INSERT INTO table_t VALUES(1);
+END|
+SELECT * FROM table_t;
+a
+1
+SET GLOBAL event_scheduler=OFF;
+SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS 
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='stored_programs' ORDER BY OBJECT_NAME;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_STATEMENTS
+FUNCTION	stored_programs	append	1	1
+EVENT	stored_programs	e1	1	1
+FUNCTION	stored_programs	fac	1	19
+PROCEDURE	stored_programs	sampleproc1	1	2
+PROCEDURE	stored_programs	sampleproc2	1	5
+PROCEDURE	stored_programs	sampleproc3	1	10
+PROCEDURE	stored_programs	sampleproc4	1	11
+TRIGGER	stored_programs	trg1	3	3
+TRIGGER	stored_programs	trg2	1	1
+TRIGGER	stored_programs	trg3	1	1
+TRIGGER	stored_programs	trg4	1	1
+TRIGGER	stored_programs	trg5	1	1
+FUNCTION	stored_programs	wt_avg	1	3
+SELECT EVENT_NAME, SQL_TEXT, CURRENT_SCHEMA, OBJECT_TYPE, OBJECT_SCHEMA,
+OBJECT_NAME, NESTING_EVENT_TYPE, NESTING_EVENT_LEVEL FROM
+performance_schema.events_statements_history_long WHERE
+CURRENT_SCHEMA='stored_programs' AND 
+(SQL_TEXT not like '%count(*) = 1%' OR SQL_TEXT IS NULL)
+ORDER BY OBJECT_NAME, NESTING_EVENT_LEVEL, SQL_TEXT;
+EVENT_NAME	SQL_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
+statement/scheduler/event	NULL	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/call_procedure	CALL SampleProc1(30,40,50)	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/call_procedure	CALL SampleProc2("Jwalamukhi",34)	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/call_procedure	CALL SampleProc3()	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/call_procedure	CALL SampleProc4()	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_event	CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
+BEGIN
+INSERT INTO table_t VALUES(1);
+END	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_function	CREATE FUNCTION append(s1 CHAR(8), s2 CHAR(8)) RETURNS CHAR(16)
+RETURN concat(s1, s2)	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_function	CREATE FUNCTION fac(n INT UNSIGNED) RETURNS BIGINT UNSIGNED
+BEGIN
+DECLARE f BIGINT UNSIGNED DEFAULT 1;
+WHILE n > 1 DO
+SET f = f * n;
+SET n = n - 1;
+END WHILE;
+RETURN f;
+END	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_function	CREATE FUNCTION wt_avg(n1 INT, n2 INT, n3 INT, n4 INT)
+RETURNS INT
+DETERMINISTIC
+BEGIN
+DECLARE avg INT;
+SET avg = (n1+n2+n3*2+n4*4)/8;
+RETURN avg;
+END	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_procedure	CREATE PROCEDURE SampleProc1(x1 INT, x2 INT, y INT)
+BEGIN
+INSERT INTO t1 VALUES (x1, y);
+INSERT INTO t1 VALUES (x2, y);
+END	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_procedure	CREATE PROCEDURE SampleProc2(x CHAR(16), y INT)
+BEGIN
+DECLARE z1, z2 INT;
+SET z1 = y;
+SET z2 = z1+2;
+INSERT INTO t2 VALUES (x, z2);
+END	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_procedure	CREATE PROCEDURE SampleProc3()
+BEGIN
+DECLARE ld DATE;
+DECLARE li INT;
+DECLARE lf DOUBLE;
+DECLARE ls VARCHAR(32);
+SET ld = NULL, li = NULL, lf = NULL, ls = NULL;
+INSERT INTO t3 VALUES (ld, li, lf, ls);
+INSERT INTO t3 (n, f, s) VALUES ((ld IS NULL), 1,    "ld is null"),
+((li IS NULL), 1,    "li is null"),
+((li = 0),     NULL, "li = 0"),
+((lf IS NULL), 1,    "lf is null"),
+((lf = 0),     NULL, "lf = 0"),
+((ls IS NULL), 1,    "ls is null");
+END	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_procedure	CREATE PROCEDURE SampleProc4()
+BEGIN
+DECLARE x  INT;
+SET x = 1;
+WHILE x  <= 2 DO
+INSERT INTO t4(word, mean) VALUES('a','a mean');
+SET  x = x + 1;
+END WHILE;
+END	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t1(
+i INT NOT NULL,
+j INT
+) 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
+) engine=innodb	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t3(
+d DATE,
+n INT,
+f DOUBLE,
+s VARCHAR(32)
+)	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE t4(
+`k` int(10) unsigned NOT NULL AUTO_INCREMENT,
+`word` varchar(100) NOT NULL,
+`mean` varchar(300) NOT NULL,
+PRIMARY KEY (`k`)
+)	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_table	CREATE TABLE table_t(a INT)	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+if isnull(new.j) then
+SET new.j:= new.i * 10;
+END if;
+END	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg2 AFTER INSERT ON t2 FOR EACH ROW
+BEGIN
+UPDATE t1 SET i=new.id+i ;
+END	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg3 AFTER UPDATE ON t2 FOR EACH ROW
+SET @change:= @change + new.id - old.id	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg4 BEFORE DELETE ON t1 FOR EACH ROW
+SET @del:= @del + 1	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/create_trigger	CREATE TRIGGER trg5 AFTER DELETE ON t1 FOR EACH ROW 
+SET @del:= @del + 8 + old.j	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/delete	DELETE FROM t1 WHERE i=76	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/insert	INSERT INTO t1 VALUES (10,20)	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT * FROM table_t	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT 5 * 10	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT @a	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT @a	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT @change	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT @change	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT @del	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT @del	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT append("Bolly", "wood")	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT COUNT(*) = 0 FROM information_schema.processlist
+WHERE user = 'event_scheduler'	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT fac(5)	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS 
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='stored_programs' ORDER BY OBJECT_NAME	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/select	SELECT wt_avg(1, 12, 1990, 1121990)	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/set_option	SET @a=1	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/set_option	SET @change=1	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/set_option	SET @del=1	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/set_option	SET GLOBAL event_scheduler=OFF	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/set_option	SET GLOBAL event_scheduler=ON	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sql/update	UPDATE t2 SET id=22 WHERE name="Jwalamukhi"	stored_programs	NULL	NULL	NULL	NULL	0
+statement/sp/freturn	NULL	stored_programs	FUNCTION	stored_programs	append	STATEMENT	1
+statement/sp/stmt	INSERT INTO table_t VALUES(1)	stored_programs	EVENT	stored_programs	e1	STATEMENT	1
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/jump_if_not	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/jump	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/jump_if_not	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/jump	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/jump_if_not	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/jump	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/jump_if_not	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/jump	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/jump_if_not	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/freturn	NULL	stored_programs	FUNCTION	stored_programs	fac	STATEMENT	1
+statement/sp/stmt	INSERT INTO t1 VALUES (x1, y)	stored_programs	PROCEDURE	stored_programs	sampleproc1	STATEMENT	1
+statement/sp/stmt	INSERT INTO t1 VALUES (x2, y)	stored_programs	PROCEDURE	stored_programs	sampleproc1	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc2	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc2	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc2	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc2	STATEMENT	1
+statement/sp/stmt	INSERT INTO t2 VALUES (x, z2)	stored_programs	PROCEDURE	stored_programs	sampleproc2	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc3	STATEMENT	1
+statement/sp/stmt	INSERT INTO t3 (n, f, s) VALUES ((ld IS NULL), 1,    "ld is null"),
+((li IS NULL), 1,    "li is null"),
+((li = 0),     NULL, "li = 0"),
+((lf IS NULL), 1,    "lf is null"),
+((lf = 0),     NULL, "lf = 0"),
+((ls IS NULL), 1,    "ls is null")	stored_programs	PROCEDURE	stored_programs	sampleproc3	STATEMENT	1
+statement/sp/stmt	INSERT INTO t3 VALUES (ld, li, lf, ls)	stored_programs	PROCEDURE	stored_programs	sampleproc3	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+statement/sp/jump_if_not	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+statement/sp/jump	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+statement/sp/jump_if_not	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+statement/sp/set	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+statement/sp/jump	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+statement/sp/jump_if_not	NULL	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+statement/sp/stmt	INSERT INTO t4(word, mean) VALUES('a','a mean')	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+statement/sp/stmt	INSERT INTO t4(word, mean) VALUES('a','a mean')	stored_programs	PROCEDURE	stored_programs	sampleproc4	STATEMENT	1
+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	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
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	wt_avg	STATEMENT	1
+statement/sp/set	NULL	stored_programs	FUNCTION	stored_programs	wt_avg	STATEMENT	1
+statement/sp/freturn	NULL	stored_programs	FUNCTION	stored_programs	wt_avg	STATEMENT	1
+# clean -up
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS 
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='stored_programs' ORDER BY OBJECT_NAME;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_STATEMENTS
+FUNCTION	stored_programs	append	0	0
+EVENT	stored_programs	e1	0	0
+FUNCTION	stored_programs	fac	0	0
+PROCEDURE	stored_programs	sampleproc1	0	0
+PROCEDURE	stored_programs	sampleproc2	0	0
+PROCEDURE	stored_programs	sampleproc3	0	0
+PROCEDURE	stored_programs	sampleproc4	0	0
+TRIGGER	stored_programs	trg1	0	0
+TRIGGER	stored_programs	trg2	0	0
+TRIGGER	stored_programs	trg3	0	0
+TRIGGER	stored_programs	trg4	0	0
+TRIGGER	stored_programs	trg5	0	0
+FUNCTION	stored_programs	wt_avg	0	0
+DROP PROCEDURE SampleProc1;
+DROP PROCEDURE SampleProc2;
+DROP PROCEDURE SampleProc3;
+DROP PROCEDURE SampleProc4;
+DROP FUNCTION wt_avg;
+DROP FUNCTION fac;
+DROP FUNCTION append;
+DROP TRIGGER trg1;
+DROP TRIGGER trg2;
+DROP TRIGGER trg3;
+DROP TRIGGER trg4;
+DROP TRIGGER trg5;
+DROP EVENT IF EXISTS e1;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+DROP TABLE table_t;
+DROP DATABASE stored_programs;
+SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS 
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='stored_programs' ORDER BY OBJECT_NAME;
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_STATEMENTS
+# SET-UP 
+CREATE DATABASE stored_programs;
+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,
+f DOUBLE,
+s VARCHAR(32)
+);
+CREATE TABLE t4(
+`k` int(10) unsigned NOT NULL AUTO_INCREMENT,
+`word` varchar(100) NOT NULL,
+`mean` varchar(300) NOT NULL,
+PRIMARY KEY (`k`)
+);
+############################
+# Creating Stored Programs #
+############################
+# Stored Routine ( Procedure & Function )
+CREATE PROCEDURE SampleProc1(x1 INT, x2 INT, y INT)
+BEGIN
+INSERT INTO t1 VALUES (x1, y);
+INSERT INTO t1 VALUES (x2, y);
+END|
+CREATE PROCEDURE SampleProc2(x CHAR(16), y INT)
+BEGIN
+DECLARE z1, z2 INT;
+SET z1 = y;
+SET z2 = z1+2;
+INSERT INTO t2 VALUES (x, z2);
+END|
+CREATE PROCEDURE SampleProc3()
+BEGIN
+DECLARE ld DATE;
+DECLARE li INT;
+DECLARE lf DOUBLE;
+DECLARE ls VARCHAR(32);
+SET ld = NULL, li = NULL, lf = NULL, ls = NULL;
+INSERT INTO t3 VALUES (ld, li, lf, ls);
+INSERT INTO t3 (n, f, s) VALUES ((ld IS NULL), 1,    "ld is null"),
+((li IS NULL), 1,    "li is null"),
+((li = 0),     NULL, "li = 0"),
+((lf IS NULL), 1,    "lf is null"),
+((lf = 0),     NULL, "lf = 0"),
+((ls IS NULL), 1,    "ls is null");
+END|
+CREATE PROCEDURE SampleProc4()
+BEGIN
+DECLARE x  INT;
+SET x = 1;
+WHILE x  <= 2 DO
+INSERT INTO t4(word, mean) VALUES('a','a mean');
+SET  x = x + 1;
+END WHILE;
+END|
+CREATE FUNCTION append(s1 CHAR(8), s2 CHAR(8)) RETURNS CHAR(16)
+RETURN concat(s1, s2)|
+CREATE FUNCTION wt_avg(n1 INT, n2 INT, n3 INT, n4 INT)
+RETURNS INT
+DETERMINISTIC
+BEGIN
+DECLARE avg INT;
+SET avg = (n1+n2+n3*2+n4*4)/8;
+RETURN avg;
+END|
+CREATE FUNCTION fac(n INT UNSIGNED) RETURNS BIGINT UNSIGNED
+BEGIN
+DECLARE f BIGINT UNSIGNED DEFAULT 1;
+WHILE n > 1 DO
+SET f = f * n;
+SET n = n - 1;
+END WHILE;
+RETURN f;
+END|
+# Triggers
+CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW
+BEGIN
+if isnull(new.j) then
+SET new.j:= new.i * 10;
+END if;
+END|
+CREATE TRIGGER trg2 AFTER INSERT ON t2 FOR EACH ROW
+BEGIN
+UPDATE t1 SET i=new.id+i ;
+END|
+CREATE TRIGGER trg3 AFTER UPDATE ON t2 FOR EACH ROW
+SET @change:= @change + new.id - old.id|
+CREATE TRIGGER trg4 BEFORE DELETE ON t1 FOR EACH ROW
+SET @del:= @del + 1|
+CREATE TRIGGER trg5 AFTER DELETE ON t1 FOR EACH ROW 
+SET @del:= @del + 8 + old.j|
+update performance_schema.setup_instruments set enabled='YES', timed='NO'
+  where name like "statement/sp/%" order by name;
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+#####################
+# Executing queries #
+#####################
+INSERT INTO t1 VALUES (10,20);
+CALL SampleProc1(30,40,50);
+SET @a=1;
+SELECT @a;
+@a
+1
+CALL SampleProc2("Jwalamukhi",34);
+SELECT @a;
+@a
+1
+CALL SampleProc3();
+CALL SampleProc4();
+SET @change=1;
+SELECT @change;
+@change
+1
+UPDATE t2 SET id=22 WHERE name="Jwalamukhi";
+SELECT @change;
+@change
+-13
+SET @del=1;
+SELECT @del;
+@del
+1
+DELETE FROM t1 WHERE i=76;
+SELECT @del;
+@del
+60
+SELECT wt_avg(1, 12, 1990, 1121990);
+wt_avg(1, 12, 1990, 1121990)
+561494
+SELECT fac(5);
+fac(5)
+120
+SELECT append("Bolly", "wood");
+append("Bolly", "wood")
+Bollywood
+# Event
+SET GLOBAL event_scheduler=ON;
+CREATE TABLE table_t(a INT);
+CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
+BEGIN
+INSERT INTO table_t VALUES(1);
+END|
+SELECT * FROM table_t;
+a
+1
+SET GLOBAL event_scheduler=OFF;
+SELECT EVENT_NAME, TIMER_START, TIMER_END, TIMER_WAIT FROM
+performance_schema.events_statements_history_long WHERE
+CURRENT_SCHEMA='stored_programs' AND EVENT_NAME like "statement/sp/%";
+EVENT_NAME	TIMER_START	TIMER_END	TIMER_WAIT
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/set	NULL	NULL	NULL
+statement/sp/jump	NULL	NULL	NULL
+statement/sp/jump_if_not	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/freturn	NULL	NULL	NULL
+statement/sp/stmt	NULL	NULL	NULL
+update performance_schema.setup_instruments set enabled='YES', timed='YES'
+  where name like "statement/sp/%" order by name;
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+DROP PROCEDURE SampleProc1;
+DROP PROCEDURE SampleProc2;
+DROP PROCEDURE SampleProc3;
+DROP PROCEDURE SampleProc4;
+DROP FUNCTION wt_avg;
+DROP FUNCTION fac;
+DROP FUNCTION append;
+DROP TRIGGER trg1;
+DROP TRIGGER trg2;
+DROP TRIGGER trg3;
+DROP TRIGGER trg4;
+DROP TRIGGER trg5;
+DROP EVENT IF EXISTS e1;
+DROP TABLE t1;
+DROP TABLE t2;
+DROP TABLE t3;
+DROP TABLE t4;
+DROP TABLE table_t;
+DROP DATABASE stored_programs;
+# set-up
+CREATE DATABASE sp;
+USE sp;
+CREATE TABLE t1(
+a INT,
+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 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 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 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 
+SELECT OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_STATEMENTS
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='sp';
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_STATEMENTS
+# create few stored programs 
+CREATE PROCEDURE p(x1 INT, x2 INT)
+BEGIN
+INSERT INTO t1 VALUES (x1, x2);
+END|
+CREATE FUNCTION f(y1 INT, y2 INT) RETURNS INT
+RETURN y1+y2;
+CREATE TRIGGER trg AFTER INSERT ON t1 FOR EACH ROW
+SET @neg=-1;
+# execute the created stored programs such that they fail.
+CALL p(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 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
+FROM performance_schema.events_statements_summary_by_program
+WHERE OBJECT_SCHEMA='sp';
+OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	COUNT_STAR	COUNT_STATEMENTS
+PROCEDURE	sp	p	0	0
+FUNCTION	sp	f	0	0
+#clean-up
+DROP PROCEDURE p;
+DROP FUNCTION f;
+DROP TRIGGER trg;
+DROP TABLE t1;
+DROP DATABASE sp;
diff --git a/mysql-test/suite/perfschema/r/status_reprepare.result b/mysql-test/suite/perfschema/r/status_reprepare.result
new file mode 100644
index 00000000000..4ff713b9200
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/status_reprepare.result
@@ -0,0 +1,42 @@
+
+================================================================================
+SETUP
+================================================================================
+connect con1, localhost, root,,;
+CREATE TABLE test.t1 (c1 INT);
+PREPARE stmt1 FROM "SELECT c1 FROM test.t1";
+EXECUTE stmt1;
+c1
+SHOW SESSION STATUS LIKE "%com_stmt_%prepare%";
+Variable_name	Value
+Com_stmt_prepare	1
+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 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
+SHOW SESSION STATUS LIKE "%com_stmt_%prepare%";
+Variable_name	Value
+Com_stmt_prepare	2
+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 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
+
+================================================================================
+CLEANUP
+================================================================================
+DROP TABLE test.t1;
+disconnect con1;
+connection default;
diff --git a/mysql-test/suite/perfschema/r/sxlock_func.result b/mysql-test/suite/perfschema/r/sxlock_func.result
new file mode 100644
index 00000000000..21ecd5eee0b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/sxlock_func.result
@@ -0,0 +1,65 @@
+UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
+UPDATE performance_schema.setup_instruments SET enabled = 'YES'
+WHERE name like 'wait/synch/sxlock/%';
+TRUNCATE TABLE performance_schema.events_waits_history_long;
+TRUNCATE TABLE performance_schema.events_waits_history;
+TRUNCATE TABLE performance_schema.events_waits_current;
+select name from performance_schema.setup_instruments
+where name like "wait/synch/sxlock/%"
+  and name not in
+("wait/synch/sxlock/innodb/buf_block_lock",
+"wait/synch/sxlock/innodb/buf_block_debug_latch")
+order by name;
+name
+wait/synch/sxlock/innodb/btr_search_latch
+wait/synch/sxlock/innodb/dict_operation_lock
+wait/synch/sxlock/innodb/dict_table_stats
+wait/synch/sxlock/innodb/fil_space_latch
+wait/synch/sxlock/innodb/fts_cache_init_rw_lock
+wait/synch/sxlock/innodb/fts_cache_rw_lock
+wait/synch/sxlock/innodb/hash_table_locks
+wait/synch/sxlock/innodb/index_online_log
+wait/synch/sxlock/innodb/index_tree_rw_lock
+wait/synch/sxlock/innodb/trx_i_s_cache_lock
+wait/synch/sxlock/innodb/trx_purge_latch
+select name from performance_schema.rwlock_instances
+where name in
+(
+'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'
+  )
+order by name;
+name
+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/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/dict_operation_lock
+wait/synch/sxlock/innodb/trx_i_s_cache_lock
+wait/synch/sxlock/innodb/trx_purge_latch
+drop table if exists t1;
+create table t1(a int) engine=innodb;
+begin;
+insert into t1 values (1), (2), (3);
+insert into t1 values (1), (2), (3);
+insert into t1 values (1), (2), (3);
+commit;
+drop table t1;
+select operation from performance_schema.events_waits_history_long
+where event_name like "wait/synch/sxlock/%"
+  and operation = "shared_lock" limit 1;
+operation
+shared_lock
+select operation from performance_schema.events_waits_history_long
+where event_name like "wait/synch/sxlock/%"
+  and operation = "exclusive_lock" limit 1;
+operation
+exclusive_lock
+UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
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 dfaa91a3fbc..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
@@ -6,9 +6,9 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -22,6 +22,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -65,28 +68,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -128,28 +123,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -180,15 +167,71 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	18
+TABLE	test	t2	0
+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	0
@@ -213,7 +256,7 @@ 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	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
@@ -223,29 +266,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -281,7 +318,7 @@ 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	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
@@ -291,29 +328,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -345,11 +376,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -384,39 +415,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -457,39 +482,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -527,11 +546,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -572,39 +591,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -650,39 +663,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -726,11 +733,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -777,39 +784,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	93
+TABLE	test	t1	87
 TABLE	test	t2	0
-TABLE	test	t3	184
+TABLE	test	t3	176
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -856,39 +857,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
 flush tables;
 "================== flush marker =================="
@@ -932,39 +927,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1008,39 +997,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1081,39 +1064,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1153,39 +1130,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1224,39 +1195,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1294,39 +1259,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1366,39 +1325,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1437,39 +1390,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1508,39 +1455,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1579,39 +1520,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1660,10 +1595,6 @@ TABLE	test	t1	NULL	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1671,19 +1602,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1693,9 +1622,15 @@ 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
@@ -1705,6 +1640,7 @@ 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
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 2a6537fd6bd..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
@@ -4,9 +4,9 @@ delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -21,6 +21,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -64,15 +67,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -82,10 +82,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -127,15 +127,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -145,10 +142,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -179,15 +176,77 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	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	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	0
@@ -212,7 +271,7 @@ 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	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
@@ -222,29 +281,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -280,7 +339,7 @@ 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	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
@@ -290,29 +349,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -344,11 +403,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -383,39 +442,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -456,39 +515,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -526,11 +585,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -571,39 +630,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -649,39 +708,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -725,11 +784,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -776,39 +835,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	48	16	32	8	0	0	0	8	0	0	16
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -855,39 +914,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 flush tables;
 "================== flush marker =================="
@@ -931,39 +990,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1007,39 +1066,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 13 =================="
 call dump_thread();
@@ -1080,39 +1139,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 14 =================="
 call dump_thread();
@@ -1152,39 +1211,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 15 =================="
 call dump_thread();
@@ -1223,39 +1282,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 16 =================="
 call dump_thread();
@@ -1293,39 +1352,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1365,39 +1424,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1436,39 +1495,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1507,39 +1566,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1578,39 +1637,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1673,16 +1732,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1692,9 +1751,15 @@ 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
@@ -1704,6 +1769,7 @@ 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
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 3eddd735aa2..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
@@ -4,11 +4,11 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -22,6 +22,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -65,28 +68,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -128,28 +123,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -180,15 +167,71 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	18
+TABLE	test	t2	0
+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	0
@@ -213,7 +256,7 @@ 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	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
@@ -223,29 +266,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -281,7 +318,7 @@ 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	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
@@ -291,29 +328,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -345,11 +376,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -384,39 +415,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -457,39 +482,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -527,11 +546,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -572,39 +591,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -650,39 +663,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -726,11 +733,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -777,39 +784,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	93
+TABLE	test	t1	87
 TABLE	test	t2	0
-TABLE	test	t3	184
+TABLE	test	t3	176
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -856,39 +857,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
 flush tables;
 "================== flush marker =================="
@@ -932,39 +927,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1008,39 +997,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1081,39 +1064,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1153,39 +1130,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1224,39 +1195,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1294,39 +1259,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1366,39 +1325,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1437,39 +1390,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1508,39 +1455,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1579,39 +1520,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1660,10 +1595,6 @@ TABLE	test	t1	NULL	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1671,19 +1602,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1693,9 +1622,15 @@ 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
@@ -1705,6 +1640,7 @@ 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
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 fed189a7667..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
@@ -2,11 +2,11 @@ update performance_schema.setup_consumers
 set enabled='NO' where name='thread_instrumentation';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -21,6 +21,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -64,15 +67,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -82,10 +82,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -127,15 +127,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -145,10 +142,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -179,15 +176,77 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	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	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	0
@@ -212,7 +271,7 @@ 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	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
@@ -222,29 +281,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -280,7 +339,7 @@ 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	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
@@ -290,29 +349,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -344,11 +403,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -383,39 +442,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -456,39 +515,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -526,11 +585,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -571,39 +630,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -649,39 +708,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -725,11 +784,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -776,39 +835,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	48	16	32	8	0	0	0	8	0	0	16
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -855,39 +914,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 flush tables;
 "================== flush marker =================="
@@ -931,39 +990,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1007,39 +1066,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 13 =================="
 call dump_thread();
@@ -1080,39 +1139,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 14 =================="
 call dump_thread();
@@ -1152,39 +1211,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 15 =================="
 call dump_thread();
@@ -1223,39 +1282,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 16 =================="
 call dump_thread();
@@ -1293,39 +1352,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1365,39 +1424,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1436,39 +1495,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1507,39 +1566,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1578,39 +1637,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1673,16 +1732,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1692,9 +1751,15 @@ 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
@@ -1704,6 +1769,7 @@ 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
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 ee95e4c0417..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
@@ -4,9 +4,9 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -20,6 +20,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -63,28 +66,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -126,28 +121,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -178,18 +165,18 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	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
 username	status
 user2	not found
@@ -199,25 +186,25 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -225,29 +212,83 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+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	23
+user1	wait/lock/table/sql/handler	24
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	23
+user1	wait/lock/table/sql/handler	24
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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
+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	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	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	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	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	18
+TABLE	test	t2	0
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -256,7 +297,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -267,29 +308,29 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	24
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -297,29 +338,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -351,11 +386,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -363,7 +398,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -374,29 +409,29 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	24
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -404,29 +439,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -435,7 +464,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -447,7 +476,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -455,7 +484,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
-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	0
 user2	wait/lock/table/sql/handler	0
@@ -463,17 +492,17 @@ user3	wait/io/table/sql/handler	0
 user3	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	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
@@ -481,29 +510,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -541,11 +564,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -554,75 +577,69 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user2	wait/lock/table/sql/handler	0
-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	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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -631,80 +648,74 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -748,11 +759,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -762,80 +773,74 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -845,240 +850,222 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1088,74 +1075,68 @@ 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1164,74 +1145,68 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1246,67 +1221,61 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1320,67 +1289,61 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1396,67 +1359,61 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1481,57 +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
-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	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1566,47 +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
-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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1645,43 +1590,37 @@ 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	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/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1724,9 +1663,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
-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/io/table/sql/handler	50	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
@@ -1734,10 +1673,6 @@ TABLE	test	t1	NULL	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1745,19 +1680,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1767,9 +1700,15 @@ 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
@@ -1779,6 +1718,7 @@ 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
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 d6e4e674258..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
@@ -2,9 +2,9 @@ delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -19,6 +19,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -62,15 +65,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -80,10 +80,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -125,15 +125,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -143,10 +140,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -177,18 +174,18 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	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
 username	status
 user2	not found
@@ -198,27 +195,27 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -226,29 +223,97 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+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	33
+user1	wait/lock/table/sql/handler	36
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	33
+user1	wait/lock/table/sql/handler	36
+execute dump_waits_host;
+host	event_name	count_star
+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	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	10	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	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
+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	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	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	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	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	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	18
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -257,7 +322,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -268,31 +333,31 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	36
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -300,29 +365,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -354,11 +419,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -366,7 +431,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -377,31 +442,31 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	36
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -409,29 +474,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -440,7 +505,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -452,7 +517,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -460,7 +525,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
-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	0
 user2	wait/lock/table/sql/handler	0
@@ -468,19 +533,19 @@ user3	wait/io/table/sql/handler	0
 user3	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	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
@@ -488,29 +553,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -548,11 +613,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -561,77 +626,77 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user2	wait/lock/table/sql/handler	0
-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	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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	24	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -640,82 +705,82 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	24	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -759,11 +824,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -773,82 +838,82 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	24	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -858,246 +923,246 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 13 =================="
 call dump_thread();
@@ -1107,76 +1172,76 @@ 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 14 =================="
 call dump_thread();
@@ -1185,76 +1250,76 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 15 =================="
 call dump_thread();
@@ -1269,69 +1334,69 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 16 =================="
 call dump_thread();
@@ -1345,69 +1410,69 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1423,69 +1488,69 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+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 =================="
@@ -1510,59 +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
-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	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+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 =================="
@@ -1597,49 +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
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+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 =================="
@@ -1678,45 +1743,45 @@ 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	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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+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 =================="
@@ -1759,11 +1824,11 @@ 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
-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/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
-wait/io/table/sql/handler	54	TABLE	test	t3
+wait/io/table/sql/handler	50	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
@@ -1785,16 +1850,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1804,9 +1869,15 @@ 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
@@ -1816,6 +1887,7 @@ 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
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 2d2a55efa77..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
@@ -2,11 +2,11 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -20,6 +20,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -63,28 +66,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -126,28 +121,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -178,18 +165,18 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	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
 username	status
 user2	not found
@@ -199,25 +186,25 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -225,29 +212,83 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+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	23
+user1	wait/lock/table/sql/handler	24
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	23
+user1	wait/lock/table/sql/handler	24
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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
+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	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	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	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	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	18
+TABLE	test	t2	0
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -256,7 +297,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -267,29 +308,29 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	24
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -297,29 +338,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -351,11 +386,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -363,10 +398,10 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	status
 user3	not found
@@ -374,59 +409,53 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	40	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -435,10 +464,10 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
@@ -447,63 +476,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user3	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	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	0
 user3	wait/lock/table/sql/handler	0
 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/io/table/sql/handler	40	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -541,11 +564,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -554,75 +577,69 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	75	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -631,80 +648,74 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user4	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	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	0
 user4	wait/lock/table/sql/handler	0
 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/io/table/sql/handler	75	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -748,11 +759,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -762,80 +773,74 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	93
+TABLE	test	t1	87
 TABLE	test	t2	0
-TABLE	test	t3	184
+TABLE	test	t3	176
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -845,317 +850,293 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1164,74 +1145,68 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1242,71 +1217,65 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1320,67 +1289,61 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1396,67 +1359,61 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1481,57 +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
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1566,47 +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
-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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1645,43 +1590,37 @@ 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	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/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1724,9 +1663,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
-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/io/table/sql/handler	120	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
@@ -1734,10 +1673,6 @@ TABLE	test	t1	NULL	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1745,19 +1680,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1767,9 +1700,15 @@ 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
@@ -1779,6 +1718,7 @@ 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
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 de8fc4702a6..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,10 +1,10 @@
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -19,6 +19,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -62,15 +65,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -80,10 +80,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -125,15 +125,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -143,10 +140,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -177,18 +174,86 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	33
+user1	wait/lock/table/sql/handler	36
+execute dump_waits_host;
+host	event_name	count_star
+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	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	10	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	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
+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	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	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	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	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	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	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	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
@@ -198,27 +263,27 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -226,29 +291,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -257,7 +322,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -268,31 +333,31 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	36
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -300,29 +365,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -354,11 +419,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -366,10 +431,10 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	status
 user3	not found
@@ -377,61 +442,61 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	26	TABLE	test	t2
 wait/lock/table/sql/handler	24	TABLE	test	t2
-wait/io/table/sql/handler	44	TABLE	test	t3
+wait/io/table/sql/handler	40	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -440,10 +505,10 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
@@ -452,65 +517,65 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user3	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	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	0
 user3	wait/lock/table/sql/handler	0
 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/io/table/sql/handler	26	TABLE	test	t2
 wait/lock/table/sql/handler	24	TABLE	test	t2
-wait/io/table/sql/handler	44	TABLE	test	t3
+wait/io/table/sql/handler	40	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -548,11 +613,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -561,77 +626,77 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	48	TABLE	test	t2
 wait/lock/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	81	TABLE	test	t3
+wait/io/table/sql/handler	75	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -640,82 +705,82 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user4	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	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	0
 user4	wait/lock/table/sql/handler	0
 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/io/table/sql/handler	48	TABLE	test	t2
 wait/lock/table/sql/handler	36	TABLE	test	t2
-wait/io/table/sql/handler	81	TABLE	test	t3
+wait/io/table/sql/handler	75	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -759,11 +824,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -773,82 +838,82 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	48	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	48	16	32	8	0	0	0	8	0	0	16
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -858,325 +923,325 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 14 =================="
 call dump_thread();
@@ -1185,76 +1250,76 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 15 =================="
 call dump_thread();
@@ -1265,73 +1330,73 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 16 =================="
 call dump_thread();
@@ -1345,69 +1410,69 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1423,69 +1488,69 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1510,59 +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
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1597,49 +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
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1678,45 +1743,45 @@ 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	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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1759,11 +1824,11 @@ 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
-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/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
-wait/io/table/sql/handler	128	TABLE	test	t3
+wait/io/table/sql/handler	120	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
@@ -1785,16 +1850,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1804,9 +1869,15 @@ 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
@@ -1816,6 +1887,7 @@ 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
diff --git a/mysql-test/suite/perfschema/r/table_aggregate_off.result b/mysql-test/suite/perfschema/r/table_aggregate_off.result
index 77a714563fe..22fd9f9daf5 100644
--- a/mysql-test/suite/perfschema/r/table_aggregate_off.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_off.result
@@ -2,11 +2,11 @@ update performance_schema.setup_consumers
 set enabled='NO' where name='global_instrumentation';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -21,6 +21,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -64,15 +67,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -82,10 +82,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -127,15 +127,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -145,10 +142,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -179,15 +176,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -218,15 +215,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -236,10 +230,69 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	0
+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	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	0	0	0	0	0	0	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t2	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	0	0	0	0	0	0	0	0	0	0
+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	0
@@ -286,15 +339,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -304,10 +354,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -344,11 +394,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -389,15 +439,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -407,10 +454,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -462,15 +509,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -480,10 +524,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -526,11 +570,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -577,15 +621,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -595,10 +636,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -655,15 +696,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -673,10 +711,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -725,11 +763,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -782,15 +820,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -800,10 +835,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -861,15 +896,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -879,10 +911,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -937,15 +969,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -955,10 +984,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -1013,15 +1042,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1031,10 +1057,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -1086,15 +1112,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1104,10 +1127,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -1158,15 +1181,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1176,10 +1196,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -1229,15 +1249,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1247,10 +1264,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -1299,15 +1316,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1317,10 +1331,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -1371,15 +1385,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1389,10 +1400,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -1442,15 +1453,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1460,10 +1468,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -1513,15 +1521,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1531,10 +1536,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -1584,15 +1589,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1602,10 +1604,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -1655,15 +1657,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1673,16 +1672,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1692,9 +1691,15 @@ 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
@@ -1704,6 +1709,7 @@ 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
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 c176679a95d..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
@@ -6,9 +6,9 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -22,6 +22,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -65,28 +68,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -128,28 +123,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -180,18 +167,74 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	23
+user1	wait/lock/table/sql/handler	24
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	18
+TABLE	test	t2	0
+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	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
@@ -201,19 +244,19 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -223,29 +266,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -254,7 +291,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -265,23 +302,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	24
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -291,29 +328,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -345,11 +376,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -357,7 +388,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -368,23 +399,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	24
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -394,29 +425,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -425,7 +450,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -437,7 +462,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -445,7 +470,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
-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	0
 user2	wait/lock/table/sql/handler	0
@@ -453,11 +478,11 @@ user3	wait/io/table/sql/handler	0
 user3	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	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
@@ -467,29 +492,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -527,11 +546,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -540,71 +559,65 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user2	wait/lock/table/sql/handler	0
-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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -613,76 +626,70 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -726,11 +733,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -740,76 +747,70 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	43
+TABLE	test	t1	41
 TABLE	test	t2	0
-TABLE	test	t3	82
+TABLE	test	t3	78
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -819,228 +820,210 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1050,70 +1033,64 @@ 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	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1122,70 +1099,64 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1200,63 +1171,57 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1270,63 +1235,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1342,63 +1301,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1423,53 +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
-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	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1504,43 +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
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1579,39 +1520,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
+TABLE	test	t1	45
 TABLE	test	t2	0
-TABLE	test	t3	86
+TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1660,10 +1595,6 @@ TABLE	test	t1	NULL	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1671,19 +1602,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1693,9 +1622,15 @@ 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
@@ -1705,6 +1640,7 @@ 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
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 38c8813ea18..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
@@ -4,9 +4,9 @@ delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -21,6 +21,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -64,15 +67,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -82,10 +82,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -127,15 +127,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -145,10 +142,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -179,18 +176,18 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	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
 username	status
 user2	not found
@@ -200,19 +197,19 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -222,29 +219,91 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+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	33
+user1	wait/lock/table/sql/handler	36
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	33
+user1	wait/lock/table/sql/handler	36
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	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	18
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -253,7 +312,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -264,23 +323,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	36
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -290,29 +349,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -344,11 +403,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -356,7 +415,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -367,23 +426,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	36
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -393,29 +452,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -424,7 +483,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -436,7 +495,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -444,7 +503,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
-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	0
 user2	wait/lock/table/sql/handler	0
@@ -452,11 +511,11 @@ user3	wait/io/table/sql/handler	0
 user3	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	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
@@ -466,29 +525,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -526,11 +585,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -539,71 +598,71 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user2	wait/lock/table/sql/handler	0
-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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -612,76 +671,76 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -725,11 +784,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -739,76 +798,76 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -818,228 +877,228 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 13 =================="
 call dump_thread();
@@ -1049,70 +1108,70 @@ 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	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 14 =================="
 call dump_thread();
@@ -1121,70 +1180,70 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 15 =================="
 call dump_thread();
@@ -1199,63 +1258,63 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 16 =================="
 call dump_thread();
@@ -1269,63 +1328,63 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1341,63 +1400,63 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	localhost	wait/lock/table/sql/handler	0
-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	0
 user4	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	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+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 =================="
@@ -1422,53 +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
-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	0
 user2	wait/lock/table/sql/handler	0
-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	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+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 =================="
@@ -1503,43 +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
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+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 =================="
@@ -1578,39 +1637,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	47
-TABLE	test	t2	64
-TABLE	test	t3	86
+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 =================="
@@ -1673,16 +1732,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1692,9 +1751,15 @@ 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
@@ -1704,6 +1769,7 @@ 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
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 9144d81c8a0..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
@@ -4,11 +4,11 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -22,6 +22,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -65,28 +68,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -128,28 +123,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -180,18 +167,74 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	24
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	23
+user1	wait/lock/table/sql/handler	24
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	18
+TABLE	test	t2	0
+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	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
@@ -201,19 +244,19 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -223,29 +266,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -254,7 +291,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -265,23 +302,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	24
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -291,29 +328,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
 TABLE	test	t2	0
-TABLE	test	t3	31
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -345,11 +376,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -357,10 +388,10 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	status
 user3	not found
@@ -368,55 +399,49 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -425,10 +450,10 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
@@ -437,59 +462,53 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user3	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	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	0
 user3	wait/lock/table/sql/handler	0
 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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-TABLE	test	t1	40
+TABLE	test	t1	38
 TABLE	test	t2	0
-TABLE	test	t3	72
+TABLE	test	t3	68
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -527,11 +546,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -540,71 +559,65 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -613,76 +626,70 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 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
-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	0
 user4	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	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	0
 user4	wait/lock/table/sql/handler	0
 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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	65
+TABLE	test	t1	61
 TABLE	test	t2	0
-TABLE	test	t3	123
+TABLE	test	t3	117
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -726,11 +733,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -740,76 +747,70 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	93
+TABLE	test	t1	87
 TABLE	test	t2	0
-TABLE	test	t3	184
+TABLE	test	t3	176
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -819,301 +820,277 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1122,70 +1099,64 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	24
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1196,67 +1167,61 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	24
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1270,63 +1235,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1342,63 +1301,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1423,53 +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
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1504,43 +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
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1579,39 +1520,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
+TABLE	test	t1	91
 TABLE	test	t2	0
-TABLE	test	t3	188
+TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1660,10 +1595,6 @@ TABLE	test	t1	NULL	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1671,19 +1602,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1693,9 +1622,15 @@ 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
@@ -1705,6 +1640,7 @@ 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
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 10736990dbe..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
@@ -2,11 +2,11 @@ update performance_schema.setup_consumers
 set enabled='NO' where name like 'event%';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -21,6 +21,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -64,15 +67,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -82,10 +82,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -127,15 +127,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -145,10 +142,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -179,18 +176,80 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	36
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	33
+user1	wait/lock/table/sql/handler	36
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	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	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	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
@@ -200,19 +259,19 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -222,29 +281,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -253,7 +312,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -264,23 +323,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user2	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	36
 user2	wait/io/table/sql/handler	0
 user2	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	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
@@ -290,29 +349,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	18
-TABLE	test	t2	24
-TABLE	test	t3	31
+TABLE	test	t2	22
+TABLE	test	t3	29
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -344,11 +403,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -356,10 +415,10 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	status
 user3	not found
@@ -367,55 +426,55 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -424,10 +483,10 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
@@ -436,59 +495,59 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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	0
 user3	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	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	0
 user3	wait/lock/table/sql/handler	0
 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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
-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;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -526,11 +585,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -539,71 +598,71 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -612,76 +671,76 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 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
-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	0
 user4	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	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	0
 user4	wait/lock/table/sql/handler	0
 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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -725,11 +784,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -739,76 +798,76 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	48	16	32	8	0	0	0	8	0	0	16
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -818,301 +877,301 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 14 =================="
 call dump_thread();
@@ -1121,70 +1180,70 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	36
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 15 =================="
 call dump_thread();
@@ -1195,67 +1254,67 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	36
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 "================== Step 16 =================="
 call dump_thread();
@@ -1269,63 +1328,63 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-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;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1341,63 +1400,63 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1422,53 +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
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1503,43 +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
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1578,39 +1637,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
-TABLE	test	t1	97
-TABLE	test	t2	136
-TABLE	test	t3	188
+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 =================="
@@ -1673,16 +1732,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1692,9 +1751,15 @@ 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
@@ -1704,6 +1769,7 @@ 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
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 a8fd0a7eb72..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
@@ -8,9 +8,9 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -24,6 +24,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -67,28 +70,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -130,28 +125,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -182,15 +169,71 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	8
+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	0
@@ -215,7 +258,7 @@ 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	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
@@ -225,29 +268,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -283,7 +320,7 @@ 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	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
@@ -293,29 +330,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -347,11 +378,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -386,39 +417,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	20
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	44
+TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -459,39 +484,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	20
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	44
+TABLE	test	t3	40
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -529,11 +548,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -574,39 +593,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	35
+TABLE	test	t1	31
 TABLE	test	t2	0
-TABLE	test	t3	81
+TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -652,39 +665,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	35
+TABLE	test	t1	31
 TABLE	test	t2	0
-TABLE	test	t3	81
+TABLE	test	t3	75
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -728,11 +735,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -779,39 +786,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -858,39 +859,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection default;
 flush tables;
 "================== flush marker =================="
@@ -934,39 +929,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1010,39 +999,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1083,39 +1066,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1155,39 +1132,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1226,39 +1197,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1296,39 +1261,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1368,39 +1327,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1439,39 +1392,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1510,39 +1457,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1581,39 +1522,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1662,10 +1597,6 @@ TABLE	test	t1	NULL	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1673,19 +1604,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1695,9 +1624,15 @@ 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
@@ -1707,6 +1642,7 @@ 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
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 701a25194f4..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
@@ -6,9 +6,9 @@ delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -23,6 +23,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -66,15 +69,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -84,10 +84,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -129,15 +129,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -147,10 +144,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -181,15 +178,77 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	0	0	0	0	0	0	0	0	0	0
+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	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	0
@@ -214,7 +273,7 @@ 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	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
@@ -224,29 +283,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -282,7 +341,7 @@ 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	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
@@ -292,29 +351,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -346,11 +405,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -385,39 +444,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	20
-TABLE	test	t2	30
-TABLE	test	t3	44
+TABLE	test	t1	18
+TABLE	test	t2	26
+TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -458,39 +517,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	20
-TABLE	test	t2	30
-TABLE	test	t3	44
+TABLE	test	t1	18
+TABLE	test	t2	26
+TABLE	test	t3	40
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -528,11 +587,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -573,39 +632,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	35
-TABLE	test	t2	54
-TABLE	test	t3	81
+TABLE	test	t1	31
+TABLE	test	t2	48
+TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -651,39 +710,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	35
-TABLE	test	t2	54
-TABLE	test	t3	81
+TABLE	test	t1	31
+TABLE	test	t2	48
+TABLE	test	t3	75
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -727,11 +786,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -778,39 +837,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -857,39 +916,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection default;
 flush tables;
 "================== flush marker =================="
@@ -933,39 +992,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1009,39 +1068,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1082,39 +1141,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1154,39 +1213,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1225,39 +1284,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1295,39 +1354,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1367,39 +1426,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1438,39 +1497,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1509,39 +1568,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1580,39 +1639,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1675,16 +1734,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1694,9 +1753,15 @@ 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
@@ -1706,6 +1771,7 @@ 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
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 4d8d625ee00..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
@@ -6,11 +6,11 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -24,6 +24,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -67,28 +70,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -130,28 +125,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -182,15 +169,71 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	8
+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	0
@@ -215,7 +258,7 @@ 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	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
@@ -225,29 +268,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -283,7 +320,7 @@ 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	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
@@ -293,29 +330,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -347,11 +378,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -386,39 +417,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	20
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	44
+TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -459,39 +484,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	20
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	44
+TABLE	test	t3	40
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -529,11 +548,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -574,39 +593,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	35
+TABLE	test	t1	31
 TABLE	test	t2	0
-TABLE	test	t3	81
+TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -652,39 +665,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	35
+TABLE	test	t1	31
 TABLE	test	t2	0
-TABLE	test	t3	81
+TABLE	test	t3	75
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -728,11 +735,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -779,39 +786,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -858,39 +859,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection default;
 flush tables;
 "================== flush marker =================="
@@ -934,39 +929,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1010,39 +999,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1083,39 +1066,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1155,39 +1132,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1226,39 +1197,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1296,39 +1261,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1368,39 +1327,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1439,39 +1392,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1510,39 +1457,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1581,39 +1522,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1662,10 +1597,6 @@ TABLE	test	t1	NULL	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1673,19 +1604,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1695,9 +1624,15 @@ 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
@@ -1707,6 +1642,7 @@ 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
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 8a8de99fd4f..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
@@ -4,11 +4,11 @@ update performance_schema.setup_consumers
 set enabled='NO' where name='thread_instrumentation';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -23,6 +23,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -66,15 +69,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -84,10 +84,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -129,15 +129,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -147,10 +144,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -181,15 +178,77 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	0	0	0	0	0	0	0	0	0	0
+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	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	0
@@ -214,7 +273,7 @@ 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	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
@@ -224,29 +283,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -282,7 +341,7 @@ 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	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
@@ -292,29 +351,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -346,11 +405,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -385,39 +444,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	20
-TABLE	test	t2	30
-TABLE	test	t3	44
+TABLE	test	t1	18
+TABLE	test	t2	26
+TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -458,39 +517,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	20
-TABLE	test	t2	30
-TABLE	test	t3	44
+TABLE	test	t1	18
+TABLE	test	t2	26
+TABLE	test	t3	40
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -528,11 +587,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -573,39 +632,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	35
-TABLE	test	t2	54
-TABLE	test	t3	81
+TABLE	test	t1	31
+TABLE	test	t2	48
+TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -651,39 +710,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	35
-TABLE	test	t2	54
-TABLE	test	t3	81
+TABLE	test	t1	31
+TABLE	test	t2	48
+TABLE	test	t3	75
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -727,11 +786,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -778,39 +837,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -857,39 +916,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection default;
 flush tables;
 "================== flush marker =================="
@@ -933,39 +992,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
@@ -1009,39 +1068,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1082,39 +1141,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1154,39 +1213,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1225,39 +1284,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1295,39 +1354,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1367,39 +1426,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1438,39 +1497,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1509,39 +1568,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1580,39 +1639,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1675,16 +1734,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1694,9 +1753,15 @@ 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
@@ -1706,6 +1771,7 @@ 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
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 987732538c4..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
@@ -6,9 +6,9 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -22,6 +22,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -65,28 +68,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -128,28 +123,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -180,18 +167,18 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	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
 username	status
 user2	not found
@@ -201,53 +188,105 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+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	23
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	23
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	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	8
+TABLE	test	t2	0
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -256,7 +295,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -267,57 +306,51 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user1	wait/io/table/sql/handler	25
+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
-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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -349,11 +382,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -361,7 +394,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -372,57 +405,51 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user1	wait/io/table/sql/handler	25
+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
-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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -431,7 +458,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -443,7 +470,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
@@ -451,7 +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
-user1	wait/io/table/sql/handler	25
+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
@@ -459,45 +486,39 @@ user3	wait/io/table/sql/handler	0
 user3	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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -535,11 +556,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -548,73 +569,67 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -623,78 +638,72 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -738,11 +747,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -752,78 +761,72 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -833,234 +836,216 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1070,72 +1055,66 @@ 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1144,72 +1123,66 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1224,65 +1197,59 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1296,65 +1263,59 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1370,65 +1331,59 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1453,55 +1408,49 @@ 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1536,45 +1485,39 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1613,41 +1556,35 @@ 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	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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1690,18 +1627,14 @@ 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
-wait/io/table/sql/handler	23	TABLE	test	t1
-wait/io/table/sql/handler	54	TABLE	test	t3
+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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1709,19 +1642,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1731,9 +1662,15 @@ 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
@@ -1743,6 +1680,7 @@ 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
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 324c6534303..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
@@ -4,9 +4,9 @@ delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -21,6 +21,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -64,15 +67,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -82,10 +82,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -127,15 +127,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -145,10 +142,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -179,18 +176,18 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	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
 username	status
 user2	not found
@@ -200,54 +197,119 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+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	33
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	33
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	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	0	0	0	0	0	0	0	0	0	0
+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	8
+TABLE	test	t2	10
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -256,7 +318,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -267,58 +329,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user1	wait/io/table/sql/handler	37
+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
-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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -350,11 +412,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -362,7 +424,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -373,58 +435,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user1	wait/io/table/sql/handler	37
+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
-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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -433,7 +495,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -445,7 +507,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
@@ -453,7 +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
-user1	wait/io/table/sql/handler	37
+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
@@ -461,46 +523,46 @@ user3	wait/io/table/sql/handler	0
 user3	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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -538,11 +600,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -551,74 +613,74 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -627,79 +689,79 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -743,11 +805,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -757,79 +819,79 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -839,237 +901,237 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1079,73 +1141,73 @@ 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1154,73 +1216,73 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1235,66 +1297,66 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1308,66 +1370,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1383,66 +1445,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1467,56 +1529,56 @@ 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1551,46 +1613,46 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1629,42 +1691,42 @@ 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	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
+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	18	12	6	12	2	4	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1707,9 +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
-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	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	0	0	0	0	0	0	0
@@ -1730,16 +1792,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1749,9 +1811,15 @@ 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
@@ -1761,6 +1829,7 @@ 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
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 914bcc7084b..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
@@ -4,11 +4,11 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -22,6 +22,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -65,28 +68,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -128,28 +123,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -180,18 +167,18 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	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
 username	status
 user2	not found
@@ -201,53 +188,105 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+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	23
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	23
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	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	8
+TABLE	test	t2	0
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -256,7 +295,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -267,57 +306,51 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user1	wait/io/table/sql/handler	25
+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
-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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -349,11 +382,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -361,10 +394,10 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	status
 user3	not found
@@ -372,57 +405,51 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 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	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
+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	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	20
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	44
+TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -431,10 +458,10 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
@@ -443,61 +470,55 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 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
-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
+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	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	20
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	44
+TABLE	test	t3	40
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -535,11 +556,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -548,73 +569,67 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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	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
+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	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	35
+TABLE	test	t1	31
 TABLE	test	t2	0
-TABLE	test	t3	81
+TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -623,78 +638,72 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 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	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
+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	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	35
+TABLE	test	t1	31
 TABLE	test	t2	0
-TABLE	test	t3	81
+TABLE	test	t3	75
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -738,11 +747,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -752,78 +761,72 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -833,309 +836,285 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1144,72 +1123,66 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1220,69 +1193,63 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1296,65 +1263,59 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1370,65 +1331,59 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1453,55 +1408,49 @@ 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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1536,45 +1485,39 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1613,41 +1556,35 @@ 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1690,18 +1627,14 @@ 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
-wait/io/table/sql/handler	53	TABLE	test	t1
-wait/io/table/sql/handler	128	TABLE	test	t3
+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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1709,19 +1642,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1731,9 +1662,15 @@ 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
@@ -1743,6 +1680,7 @@ 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
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 f92ebe8e467..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
@@ -2,11 +2,11 @@ update performance_schema.setup_instruments
 set enabled='NO' where name='wait/lock/table/sql/handler';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -21,6 +21,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -64,15 +67,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -82,10 +82,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -127,15 +127,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -145,10 +142,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -179,18 +176,18 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	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
 username	status
 user2	not found
@@ -200,54 +197,119 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+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	33
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	33
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	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	0	0	0	0	0	0	0	0	0	0
+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	8
+TABLE	test	t2	10
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -256,7 +318,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -267,58 +329,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user1	wait/io/table/sql/handler	37
+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
-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
+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	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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -350,11 +412,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -362,10 +424,10 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	status
 user3	not found
@@ -373,58 +435,58 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 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	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
+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	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	20
-TABLE	test	t2	30
-TABLE	test	t3	44
+TABLE	test	t1	18
+TABLE	test	t2	26
+TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -433,10 +495,10 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
@@ -445,62 +507,62 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 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
-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
+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	15	10	5	10	2	3	0
-TABLE	test	t1	index_b	1	1	0	1	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	20
-TABLE	test	t2	30
-TABLE	test	t3	44
+TABLE	test	t1	18
+TABLE	test	t2	26
+TABLE	test	t3	40
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -538,11 +600,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -551,74 +613,74 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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	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
+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	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	35
-TABLE	test	t2	54
-TABLE	test	t3	81
+TABLE	test	t1	31
+TABLE	test	t2	48
+TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -627,79 +689,79 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 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	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
+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	27	18	9	18	3	6	0
-TABLE	test	t1	index_b	2	2	0	2	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	35
-TABLE	test	t2	54
-TABLE	test	t3	81
+TABLE	test	t1	31
+TABLE	test	t2	48
+TABLE	test	t3	75
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -743,11 +805,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -757,79 +819,79 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -839,313 +901,313 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1154,73 +1216,73 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1231,70 +1293,70 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1308,66 +1370,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1383,66 +1445,66 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1467,56 +1529,56 @@ 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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1551,46 +1613,46 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1629,42 +1691,42 @@ 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	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
+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	42	28	14	28	4	10	0
-TABLE	test	t1	index_b	3	3	0	3	0	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
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
 TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1707,9 +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
-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	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	0	0	0	0	0	0	0
@@ -1730,16 +1792,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1749,9 +1811,15 @@ 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
@@ -1761,6 +1829,7 @@ 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
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 8eb52d58efc..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
@@ -8,9 +8,9 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -24,6 +24,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -67,28 +70,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -130,28 +125,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -182,18 +169,74 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	23
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	8
+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	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -203,19 +246,19 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -225,29 +268,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -256,7 +293,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -267,23 +304,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user1	wait/io/table/sql/handler	25
+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
-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
@@ -293,29 +330,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -347,11 +378,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -359,7 +390,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -370,23 +401,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user1	wait/io/table/sql/handler	25
+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
-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
@@ -396,29 +427,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -427,7 +452,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -439,7 +464,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
@@ -447,7 +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
-user1	wait/io/table/sql/handler	25
+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
@@ -455,11 +480,11 @@ user3	wait/io/table/sql/handler	0
 user3	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
@@ -469,29 +494,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -529,11 +548,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -542,71 +561,65 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -615,76 +628,70 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -728,11 +735,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -742,76 +749,70 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -821,228 +822,210 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	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
 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1052,70 +1035,64 @@ 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	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1124,70 +1101,64 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1202,63 +1173,57 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1272,63 +1237,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1344,63 +1303,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1425,53 +1378,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
-user1	wait/io/table/sql/handler	25
+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
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1506,43 +1453,37 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1581,39 +1522,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	21	13	8	13	2	6	0
+TABLE	test	t3	50	32	18	32	6	12	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	23
+TABLE	test	t1	21
 TABLE	test	t2	0
-TABLE	test	t3	54
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1662,10 +1597,6 @@ TABLE	test	t1	NULL	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1673,19 +1604,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1695,9 +1624,15 @@ 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
@@ -1707,6 +1642,7 @@ 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
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 fba8a48ad35..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
@@ -6,9 +6,9 @@ delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -23,6 +23,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -66,15 +69,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -84,10 +84,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -129,15 +129,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -147,10 +144,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -181,18 +178,80 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	33
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	0	0	0	0	0	0	0	0	0	0
+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	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	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -202,19 +261,19 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -224,29 +283,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -255,7 +314,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -266,23 +325,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user1	wait/io/table/sql/handler	37
+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
-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
@@ -292,29 +351,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -346,11 +405,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -358,7 +417,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -369,23 +428,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user1	wait/io/table/sql/handler	37
+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
-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
@@ -395,29 +454,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -426,7 +485,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -438,7 +497,7 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
@@ -446,7 +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
-user1	wait/io/table/sql/handler	37
+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
@@ -454,11 +513,11 @@ user3	wait/io/table/sql/handler	0
 user3	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
@@ -468,29 +527,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -528,11 +587,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -541,71 +600,71 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -614,76 +673,76 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -727,11 +786,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -741,76 +800,76 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -820,228 +879,228 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	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
 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
@@ -1051,70 +1110,70 @@ 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	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1123,70 +1182,70 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1201,63 +1260,63 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1271,63 +1330,63 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1343,63 +1402,63 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1424,53 +1483,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
-user1	wait/io/table/sql/handler	37
+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
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1505,43 +1564,43 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1580,39 +1639,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	17	11	6	11	2	4	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	32	20	12	20	4	8	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	46	28	18	28	6	12	0
-TABLE	test	t3	index_b	6	6	0	6	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	23
-TABLE	test	t2	36
-TABLE	test	t3	54
+TABLE	test	t1	21
+TABLE	test	t2	32
+TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1675,16 +1734,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1694,9 +1753,15 @@ 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
@@ -1706,6 +1771,7 @@ 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
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 2bcabb81def..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
@@ -6,11 +6,11 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -24,6 +24,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -67,28 +70,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -130,28 +125,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -182,18 +169,74 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	23
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	23
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	8
+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	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -203,19 +246,19 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -225,29 +268,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -256,7 +293,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -267,23 +304,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+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
-user1	wait/io/table/sql/handler	25
+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
-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
@@ -293,29 +330,23 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	8
 TABLE	test	t2	0
-TABLE	test	t3	17
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -347,11 +378,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -359,10 +390,10 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	status
 user3	not found
@@ -370,55 +401,49 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	20
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	44
+TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -427,10 +452,10 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
@@ -439,59 +464,53 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 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
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	18	11	7	11	2	5	0
+TABLE	test	t3	40	25	15	25	6	9	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	20
+TABLE	test	t1	18
 TABLE	test	t2	0
-TABLE	test	t3	44
+TABLE	test	t3	40
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -529,11 +548,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -542,71 +561,65 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	35
+TABLE	test	t1	31
 TABLE	test	t2	0
-TABLE	test	t3	81
+TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -615,76 +628,70 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	31	19	12	19	3	9	0
+TABLE	test	t3	75	48	27	48	9	18	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	35
+TABLE	test	t1	31
 TABLE	test	t2	0
-TABLE	test	t3	81
+TABLE	test	t3	75
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -728,11 +735,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -742,76 +749,70 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -821,301 +822,277 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1124,70 +1101,64 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1198,67 +1169,61 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1272,63 +1237,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1344,63 +1303,57 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	25
+user1	localhost	wait/io/table/sql/handler	23
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	39
+user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	52
+user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	65
+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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1425,53 +1378,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
-user1	wait/io/table/sql/handler	25
+user1	wait/io/table/sql/handler	23
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	39
+user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	52
+user3	wait/io/table/sql/handler	48
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	65
+user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1506,43 +1453,37 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1581,39 +1522,33 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	47	29	18	29	4	14	0
+TABLE	test	t3	120	78	42	78	12	30	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
-TABLE	test	t1	53
+TABLE	test	t1	47
 TABLE	test	t2	0
-TABLE	test	t3	128
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1662,10 +1597,6 @@ TABLE	test	t1	NULL	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
 TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
@@ -1673,19 +1604,17 @@ TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1695,9 +1624,15 @@ 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
@@ -1707,6 +1642,7 @@ 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
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 323570b7d40..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
@@ -4,11 +4,11 @@ update performance_schema.setup_consumers
 set enabled='NO' where name like 'event%';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -23,6 +23,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -66,15 +69,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -84,10 +84,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -129,15 +129,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -147,10 +144,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -181,18 +178,80 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
+call dump_thread();
+username	event_name	count_star
+user1	wait/io/table/sql/handler	33
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+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	33
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	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	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	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	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	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	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	0	0	0	0	0	0	0	0	0	0
+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	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	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -202,19 +261,19 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-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
@@ -224,29 +283,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -255,7 +314,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -266,23 +325,23 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+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
-user1	wait/io/table/sql/handler	37
+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
-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
@@ -292,29 +351,29 @@ 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	2	1	1	1	0	1	0
-TABLE	test	t2	NULL	10	6	4	6	2	2	0
-TABLE	test	t2	index_b	1	1	0	1	0	0	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	1	1	0	1	0	0	0
-TABLE	test	t3	NULL	14	8	6	8	3	3	0
-TABLE	test	t3	index_b	2	2	0	2	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	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	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	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	8
-TABLE	test	t2	12
-TABLE	test	t3	17
+TABLE	test	t2	10
+TABLE	test	t3	15
 connection con2;
 insert into test.t1 set a=201, b=1, c=1;
 insert into test.t2 set a=202, b=2, c=2;
@@ -346,11 +405,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -358,10 +417,10 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	status
 user3	not found
@@ -369,55 +428,55 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	20
-TABLE	test	t2	30
-TABLE	test	t3	44
+TABLE	test	t1	18
+TABLE	test	t2	26
+TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -426,10 +485,10 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user3	wait/io/table/sql/handler	0
@@ -438,59 +497,59 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 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
-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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	14	9	5	9	2	3	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	4	2	2	2	0	2	0
-TABLE	test	t2	NULL	26	16	10	16	4	6	0
-TABLE	test	t2	index_b	2	2	0	2	0	0	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	2	2	0	2	0	0	0
-TABLE	test	t3	NULL	37	22	15	22	6	9	0
-TABLE	test	t3	index_b	5	5	0	5	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	20
-TABLE	test	t2	30
-TABLE	test	t3	44
+TABLE	test	t1	18
+TABLE	test	t2	26
+TABLE	test	t3	40
 connection con3;
 insert into test.t1 set a=301, b=1, c=1;
 insert into test.t2 set a=302, b=2, c=2;
@@ -528,11 +587,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -541,71 +600,71 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	35
-TABLE	test	t2	54
-TABLE	test	t3	81
+TABLE	test	t1	31
+TABLE	test	t2	48
+TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
 select concat(current_user(), " is connected") as status;
 status
@@ -614,76 +673,76 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 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
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	25	16	9	16	3	6	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	6	3	3	3	0	3	0
-TABLE	test	t2	NULL	48	30	18	30	6	12	0
-TABLE	test	t2	index_b	3	3	0	3	0	0	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	3	3	0	3	0	0	0
-TABLE	test	t3	NULL	69	42	27	42	9	18	0
-TABLE	test	t3	index_b	9	9	0	9	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	35
-TABLE	test	t2	54
-TABLE	test	t3	81
+TABLE	test	t1	31
+TABLE	test	t2	48
+TABLE	test	t3	75
 connection con4;
 insert into test.t1 set a=401, b=1, c=1;
 insert into test.t2 set a=402, b=2, c=2;
@@ -727,11 +786,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -741,76 +800,76 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection con1;
 lock tables test.t1 read, test.t2 read, test.t3 read;
 unlock tables;
@@ -820,301 +879,301 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection default;
 flush tables;
 "================== flush marker =================="
 "================== Step 11 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 set global read_only=1;
 set global read_only=0;
 "================== global read_only marker =================="
 "================== Step 12 =================="
 call dump_thread();
 username	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
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con1;
 "================== Step 13 =================="
 call dump_thread();
 username	status
 user1	not found
 username	event_name	count_star
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con2;
 "================== Step 14 =================="
 call dump_thread();
@@ -1123,70 +1182,70 @@ user1	not found
 username	status
 user2	not found
 username	event_name	count_star
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con3;
 "================== Step 15 =================="
 call dump_thread();
@@ -1197,67 +1256,67 @@ user2	not found
 username	status
 user3	not found
 username	event_name	count_star
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 disconnect con4;
 "================== Step 16 =================="
 call dump_thread();
@@ -1271,63 +1330,63 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 connection default;
 truncate performance_schema.events_waits_summary_by_thread_by_event_name;
 "================== BY_THREAD truncated =================="
@@ -1343,63 +1402,63 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	37
+user1	localhost	wait/io/table/sql/handler	33
 user1	localhost	wait/lock/table/sql/handler	0
-user2	localhost	wait/io/table/sql/handler	57
+user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
-user3	localhost	wait/io/table/sql/handler	76
+user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
-user4	localhost	wait/io/table/sql/handler	95
+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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
 "================== BY_ACCOUNT truncated =================="
 "================== Step 18 =================="
@@ -1424,53 +1483,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
-user1	wait/io/table/sql/handler	37
+user1	wait/io/table/sql/handler	33
 user1	wait/lock/table/sql/handler	0
-user2	wait/io/table/sql/handler	57
+user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
-user3	wait/io/table/sql/handler	76
+user3	wait/io/table/sql/handler	70
 user3	wait/lock/table/sql/handler	0
-user4	wait/io/table/sql/handler	95
+user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
 "================== BY_USER truncated =================="
 "================== Step 19 =================="
@@ -1505,43 +1564,43 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
 "================== BY_HOST truncated =================="
 "================== Step 21 =================="
@@ -1580,39 +1639,39 @@ 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	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
 execute dump_waits_index_io;
 object_type	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
+TABLE	test	t1	NULL	39	25	14	25	4	10	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	8	4	4	4	0	4	0
-TABLE	test	t2	NULL	76	48	28	48	8	20	0
-TABLE	test	t2	index_b	4	4	0	4	0	0	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	4	4	0	4	0	0	0
-TABLE	test	t3	NULL	110	68	42	68	12	30	0
-TABLE	test	t3	index_b	14	14	0	14	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	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
-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	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
 execute dump_waits_table_lock;
-object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	53
-TABLE	test	t2	84
-TABLE	test	t3	128
+TABLE	test	t1	47
+TABLE	test	t2	76
+TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
 "================== GLOBAL truncated =================="
 "================== Step 21 =================="
@@ -1675,16 +1734,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1694,9 +1753,15 @@ 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
@@ -1706,6 +1771,7 @@ 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
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 3a3d093d91e..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
@@ -8,9 +8,9 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -24,6 +24,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -67,28 +70,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -130,28 +125,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -182,15 +169,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -221,28 +208,74 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	0
+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	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -289,28 +322,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -347,11 +372,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -392,28 +417,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -465,28 +482,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -529,11 +538,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -580,28 +589,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -658,28 +659,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -728,11 +721,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -785,28 +778,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	40
@@ -864,28 +849,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -940,28 +917,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1016,28 +985,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1089,28 +1050,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1161,28 +1114,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1232,28 +1177,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1302,28 +1239,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1374,28 +1303,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1445,28 +1366,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1516,28 +1429,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1587,28 +1492,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1658,34 +1555,26 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1695,9 +1584,15 @@ 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
@@ -1707,6 +1602,7 @@ 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
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 04c4fe4d949..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
@@ -6,9 +6,9 @@ delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -23,6 +23,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -66,15 +69,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -84,10 +84,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -129,15 +129,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -147,10 +144,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -181,15 +178,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -220,15 +217,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -238,10 +232,69 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	0
+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	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	0	0	0	0	0	0	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t2	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -288,15 +341,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -306,10 +356,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -346,11 +396,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -391,15 +441,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -409,10 +456,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -464,15 +511,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -482,10 +526,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -528,11 +572,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -579,15 +623,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -597,10 +638,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -657,15 +698,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -675,10 +713,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -727,11 +765,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -784,15 +822,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -802,10 +837,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	48	16	32	8	0	0	0	8	0	0	16
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	40
@@ -863,15 +898,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -881,10 +913,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -939,15 +971,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -957,10 +986,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1015,15 +1044,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1033,10 +1059,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1088,15 +1114,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1106,10 +1129,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1160,15 +1183,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1178,10 +1198,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1231,15 +1251,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1249,10 +1266,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1301,15 +1318,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1319,10 +1333,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1373,15 +1387,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1391,10 +1402,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1444,15 +1455,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1462,10 +1470,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1515,15 +1523,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1533,10 +1538,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1586,15 +1591,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1604,10 +1606,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1657,15 +1659,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1675,16 +1674,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1694,9 +1693,15 @@ 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
@@ -1706,6 +1711,7 @@ 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
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 61783e41b1b..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
@@ -6,11 +6,11 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -24,6 +24,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -67,28 +70,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -130,28 +125,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -182,15 +169,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -221,28 +208,74 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	0
+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	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -289,28 +322,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -347,11 +372,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -392,28 +417,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -465,28 +482,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -529,11 +538,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -580,28 +589,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -658,28 +659,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -728,11 +721,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -785,28 +778,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	40
@@ -864,28 +849,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -940,28 +917,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1016,28 +985,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1089,28 +1050,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1161,28 +1114,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1232,28 +1177,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1302,28 +1239,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1374,28 +1303,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1445,28 +1366,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1516,28 +1429,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1587,28 +1492,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1658,34 +1555,26 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1695,9 +1584,15 @@ 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
@@ -1707,6 +1602,7 @@ 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
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 2be8dbdf5b3..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
@@ -4,11 +4,11 @@ update performance_schema.setup_consumers
 set enabled='NO' where name='thread_instrumentation';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -23,6 +23,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -66,15 +69,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -84,10 +84,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -129,15 +129,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -147,10 +144,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -181,15 +178,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -220,15 +217,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -238,10 +232,69 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	0
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	0
+execute dump_waits_host;
+host	event_name	count_star
+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	0
+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	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	0	0	0	0	0	0	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t2	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -288,15 +341,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -306,10 +356,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -346,11 +396,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -391,15 +441,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -409,10 +456,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -464,15 +511,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -482,10 +526,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -528,11 +572,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -579,15 +623,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -597,10 +638,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -657,15 +698,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -675,10 +713,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -727,11 +765,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -784,15 +822,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -802,10 +837,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	48	16	32	8	0	0	0	8	0	0	16
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	40
@@ -863,15 +898,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -881,10 +913,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -939,15 +971,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -957,10 +986,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1015,15 +1044,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1033,10 +1059,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1088,15 +1114,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1106,10 +1129,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1160,15 +1183,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1178,10 +1198,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1231,15 +1251,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1249,10 +1266,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1301,15 +1318,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1319,10 +1333,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1373,15 +1387,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1391,10 +1402,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1444,15 +1455,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1462,10 +1470,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1515,15 +1523,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1533,10 +1538,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1586,15 +1591,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1604,10 +1606,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1657,15 +1659,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1675,16 +1674,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1694,9 +1693,15 @@ 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
@@ -1706,6 +1711,7 @@ 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
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 0ded9d54590..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
@@ -6,9 +6,9 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -22,6 +22,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -65,28 +68,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -128,28 +123,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -180,15 +167,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -221,28 +208,76 @@ wait/lock/table/sql/handler	10	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	24
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	24
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	24
+execute dump_waits_host;
+host	event_name	count_star
+localhost	wait/io/table/sql/handler	0
+localhost	wait/lock/table/sql/handler	24
+execute dump_waits_global;
+event_name	count_star
+wait/io/table/sql/handler	0
+wait/lock/table/sql/handler	24
+execute dump_waits_history;
+event_name	count(event_name)	object_type	object_schema	object_name
+wait/lock/table/sql/handler	10	TABLE	test	t1
+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	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -291,28 +326,20 @@ wait/lock/table/sql/handler	10	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -349,11 +376,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -396,28 +423,20 @@ wait/lock/table/sql/handler	10	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -471,28 +490,20 @@ wait/lock/table/sql/handler	10	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -535,11 +546,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -588,28 +599,20 @@ wait/lock/table/sql/handler	20	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -668,28 +671,20 @@ wait/lock/table/sql/handler	20	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -738,11 +733,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -797,28 +792,20 @@ wait/lock/table/sql/handler	20	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -878,28 +865,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -956,28 +935,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1034,28 +1005,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1109,28 +1072,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1183,28 +1138,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1256,28 +1203,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1328,28 +1267,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1402,28 +1333,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1475,28 +1398,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1548,28 +1463,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1621,28 +1528,20 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1694,34 +1593,26 @@ wait/lock/table/sql/handler	24	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1731,9 +1622,15 @@ 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
@@ -1743,6 +1640,7 @@ 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
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 13642f45b5a..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
@@ -4,9 +4,9 @@ delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -21,6 +21,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -64,15 +67,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -82,10 +82,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -127,15 +127,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -145,10 +142,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -179,15 +176,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -221,15 +218,12 @@ wait/lock/table/sql/handler	12	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -239,10 +233,72 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	36
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	36
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	36
+execute dump_waits_host;
+host	event_name	count_star
+localhost	wait/io/table/sql/handler	0
+localhost	wait/lock/table/sql/handler	36
+execute dump_waits_global;
+event_name	count_star
+wait/io/table/sql/handler	0
+wait/lock/table/sql/handler	36
+execute dump_waits_history;
+event_name	count(event_name)	object_type	object_schema	object_name
+wait/lock/table/sql/handler	10	TABLE	test	t1
+wait/lock/table/sql/handler	12	TABLE	test	t2
+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	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	0	0	0	0	0	0	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t2	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -292,15 +348,12 @@ wait/lock/table/sql/handler	12	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -310,10 +363,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -350,11 +403,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -398,15 +451,12 @@ wait/lock/table/sql/handler	12	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -416,10 +466,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -474,15 +524,12 @@ wait/lock/table/sql/handler	12	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -492,10 +539,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -538,11 +585,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -592,15 +639,12 @@ wait/lock/table/sql/handler	24	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -610,10 +654,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -673,15 +717,12 @@ wait/lock/table/sql/handler	24	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -691,10 +732,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -743,11 +784,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -803,15 +844,12 @@ wait/lock/table/sql/handler	24	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -821,10 +859,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -885,15 +923,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -903,10 +938,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -964,15 +999,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -982,10 +1014,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1043,15 +1075,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1061,10 +1090,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1119,15 +1148,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1137,10 +1163,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1194,15 +1220,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1212,10 +1235,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1268,15 +1291,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1286,10 +1306,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1341,15 +1361,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1359,10 +1376,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1416,15 +1433,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1434,10 +1448,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1490,15 +1504,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1508,10 +1519,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1564,15 +1575,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1582,10 +1590,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1638,15 +1646,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1656,10 +1661,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1712,15 +1717,12 @@ wait/lock/table/sql/handler	28	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1730,16 +1732,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1749,9 +1751,15 @@ 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
@@ -1761,6 +1769,7 @@ 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
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 61c649bd2cf..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
@@ -4,11 +4,11 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -22,6 +22,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -65,28 +68,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -128,28 +123,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -180,15 +167,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -221,28 +208,76 @@ wait/lock/table/sql/handler	10	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	24
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	24
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	24
+execute dump_waits_host;
+host	event_name	count_star
+localhost	wait/io/table/sql/handler	0
+localhost	wait/lock/table/sql/handler	24
+execute dump_waits_global;
+event_name	count_star
+wait/io/table/sql/handler	0
+wait/lock/table/sql/handler	24
+execute dump_waits_history;
+event_name	count(event_name)	object_type	object_schema	object_name
+wait/lock/table/sql/handler	10	TABLE	test	t1
+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	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -291,28 +326,20 @@ wait/lock/table/sql/handler	10	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -349,11 +376,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -396,28 +423,20 @@ wait/lock/table/sql/handler	20	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -471,28 +490,20 @@ wait/lock/table/sql/handler	20	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -535,11 +546,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -588,28 +599,20 @@ wait/lock/table/sql/handler	30	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -668,28 +671,20 @@ wait/lock/table/sql/handler	30	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -738,11 +733,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -797,28 +792,20 @@ wait/lock/table/sql/handler	40	TABLE	test	t1
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	40
@@ -878,28 +865,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -956,28 +935,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1034,28 +1005,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1109,28 +1072,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1183,28 +1138,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1256,28 +1203,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1328,28 +1267,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1402,28 +1333,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1475,28 +1398,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1548,28 +1463,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1621,28 +1528,20 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1694,34 +1593,26 @@ wait/lock/table/sql/handler	44	TABLE	test	t1
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1731,9 +1622,15 @@ 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
@@ -1743,6 +1640,7 @@ 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
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 5d5282ba899..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
@@ -2,11 +2,11 @@ update performance_schema.setup_instruments
 set enabled='NO' where name='wait/io/table/sql/handler';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -21,6 +21,9 @@ events_stages_history_long	YES
 events_statements_current	YES
 events_statements_history	YES
 events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
 events_waits_current	YES
 events_waits_history	YES
 events_waits_history_long	YES
@@ -64,15 +67,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -82,10 +82,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -127,15 +127,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -145,10 +142,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -179,15 +176,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -221,15 +218,12 @@ wait/lock/table/sql/handler	12	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -239,10 +233,72 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	36
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	36
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	36
+execute dump_waits_host;
+host	event_name	count_star
+localhost	wait/io/table/sql/handler	0
+localhost	wait/lock/table/sql/handler	36
+execute dump_waits_global;
+event_name	count_star
+wait/io/table/sql/handler	0
+wait/lock/table/sql/handler	36
+execute dump_waits_history;
+event_name	count(event_name)	object_type	object_schema	object_name
+wait/lock/table/sql/handler	10	TABLE	test	t1
+wait/lock/table/sql/handler	12	TABLE	test	t2
+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	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	0	0	0	0	0	0	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t2	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -292,15 +348,12 @@ wait/lock/table/sql/handler	12	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -310,10 +363,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -350,11 +403,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -398,15 +451,12 @@ wait/lock/table/sql/handler	24	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -416,10 +466,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -474,15 +524,12 @@ wait/lock/table/sql/handler	24	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -492,10 +539,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -538,11 +585,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -592,15 +639,12 @@ wait/lock/table/sql/handler	36	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -610,10 +654,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -673,15 +717,12 @@ wait/lock/table/sql/handler	36	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -691,10 +732,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -743,11 +784,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -803,15 +844,12 @@ wait/lock/table/sql/handler	48	TABLE	test	t2
 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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -821,10 +859,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	48	16	32	8	0	0	0	8	0	0	16
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	40
@@ -885,15 +923,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -903,10 +938,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -964,15 +999,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -982,10 +1014,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1043,15 +1075,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1061,10 +1090,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1119,15 +1148,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1137,10 +1163,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1194,15 +1220,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1212,10 +1235,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1268,15 +1291,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1286,10 +1306,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1341,15 +1361,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1359,10 +1376,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1416,15 +1433,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1434,10 +1448,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1490,15 +1504,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1508,10 +1519,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1564,15 +1575,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1582,10 +1590,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1638,15 +1646,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1656,10 +1661,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1712,15 +1717,12 @@ wait/lock/table/sql/handler	52	TABLE	test	t2
 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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1730,16 +1732,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1749,9 +1751,15 @@ 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
@@ -1761,6 +1769,7 @@ 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
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 8da7fca1d3e..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
@@ -8,9 +8,9 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -24,6 +24,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -67,28 +70,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -130,28 +125,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -182,15 +169,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -221,28 +208,74 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	24
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	24
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	24
+execute dump_waits_host;
+host	event_name	count_star
+localhost	wait/io/table/sql/handler	0
+localhost	wait/lock/table/sql/handler	24
+execute dump_waits_global;
+event_name	count_star
+wait/io/table/sql/handler	0
+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	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -289,28 +322,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -347,11 +372,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -392,28 +417,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -465,28 +482,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -529,11 +538,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -580,28 +589,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -658,28 +659,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -728,11 +721,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -785,28 +778,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -864,28 +849,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -940,28 +917,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1016,28 +985,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1089,28 +1050,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1161,28 +1114,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1232,28 +1177,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1302,28 +1239,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1374,28 +1303,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1445,28 +1366,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1516,28 +1429,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1587,28 +1492,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1658,34 +1555,26 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1695,9 +1584,15 @@ 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
@@ -1707,6 +1602,7 @@ 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
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 88f658778c4..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
@@ -6,9 +6,9 @@ delete from performance_schema.setup_actors
 where user in ('user2', 'user4');
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user3	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user3	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -23,6 +23,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -66,15 +69,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -84,10 +84,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -129,15 +129,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -147,10 +144,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -181,15 +178,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -220,15 +217,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -238,10 +232,69 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	36
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	36
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	36
+execute dump_waits_host;
+host	event_name	count_star
+localhost	wait/io/table/sql/handler	0
+localhost	wait/lock/table/sql/handler	36
+execute dump_waits_global;
+event_name	count_star
+wait/io/table/sql/handler	0
+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	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	0	0	0	0	0	0	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t2	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -288,15 +341,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -306,10 +356,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -346,11 +396,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -391,15 +441,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -409,10 +456,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -464,15 +511,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -482,10 +526,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -528,11 +572,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -579,15 +623,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -597,10 +638,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -657,15 +698,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -675,10 +713,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -727,11 +765,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -784,15 +822,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -802,10 +837,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -863,15 +898,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -881,10 +913,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -939,15 +971,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -957,10 +986,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1015,15 +1044,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1033,10 +1059,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1088,15 +1114,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1106,10 +1129,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1160,15 +1183,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1178,10 +1198,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1231,15 +1251,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1249,10 +1266,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1301,15 +1318,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1319,10 +1333,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1373,15 +1387,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1391,10 +1402,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1444,15 +1455,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1462,10 +1470,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1515,15 +1523,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1533,10 +1538,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1586,15 +1591,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1604,10 +1606,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	24	10	14	4	0	0	1	5	0	0	7
-TABLE	test	t2	28	10	18	4	0	0	1	5	0	0	9
-TABLE	test	t3	32	10	22	4	0	0	1	5	0	0	11
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	24
@@ -1657,15 +1659,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1675,16 +1674,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1694,9 +1693,15 @@ 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
@@ -1706,6 +1711,7 @@ 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
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 72bc52cefa3..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
@@ -6,11 +6,11 @@ delete from performance_schema.setup_objects
 where object_name='t2';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -24,6 +24,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -67,28 +70,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -130,28 +125,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
@@ -182,15 +169,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -221,28 +208,74 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	24
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	24
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	24
+execute dump_waits_host;
+host	event_name	count_star
+localhost	wait/io/table/sql/handler	0
+localhost	wait/lock/table/sql/handler	24
+execute dump_waits_global;
+event_name	count_star
+wait/io/table/sql/handler	0
+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	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -289,28 +322,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -347,11 +372,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -392,28 +417,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -465,28 +482,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -529,11 +538,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -580,28 +589,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -658,28 +659,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -728,11 +721,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -785,28 +778,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	40
@@ -864,28 +849,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -940,28 +917,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1016,28 +985,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1089,28 +1050,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1161,28 +1114,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1232,28 +1177,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1302,28 +1239,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1374,28 +1303,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1445,28 +1366,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1516,28 +1429,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1587,28 +1492,20 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1658,34 +1555,26 @@ execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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
 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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
 execute 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	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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
 TABLE	test	t1	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1695,9 +1584,15 @@ 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
@@ -1707,6 +1602,7 @@ 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
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 d2ee0bd6c5e..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
@@ -4,11 +4,11 @@ update performance_schema.setup_consumers
 set enabled='NO' where name like 'event%';
 select * from performance_schema.setup_actors
 order by USER, HOST, ROLE;
-HOST	USER	ROLE
-localhost	user1	%
-localhost	user2	%
-localhost	user3	%
-localhost	user4	%
+HOST	USER	ROLE	ENABLED	HISTORY
+localhost	user1	%	YES	YES
+localhost	user2	%	YES	YES
+localhost	user3	%	YES	YES
+localhost	user4	%	YES	YES
 select * from performance_schema.setup_objects
 order by object_type, object_schema, object_name;
 OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	ENABLED	TIMED
@@ -23,6 +23,9 @@ events_stages_history_long	NO
 events_statements_current	NO
 events_statements_history	NO
 events_statements_history_long	NO
+events_transactions_current	NO
+events_transactions_history	NO
+events_transactions_history_long	NO
 events_waits_current	NO
 events_waits_history	NO
 events_waits_history_long	NO
@@ -66,15 +69,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -84,10 +84,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -129,15 +129,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -147,10 +144,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
@@ -181,15 +178,15 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=101;
 update test.t2 set d=d+1 where a=101;
 update test.t3 set d=d+1 where a=101;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	1
 connection default;
-"================== Step 3 =================="
+"================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
 user1	wait/io/table/sql/handler	0
@@ -220,15 +217,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -238,10 +232,69 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	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
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	36
+username	status
+user2	not found
+username	status
+user3	not found
+username	status
+user4	not found
+execute dump_waits_account;
+user	host	event_name	count_star
+user1	localhost	wait/io/table/sql/handler	0
+user1	localhost	wait/lock/table/sql/handler	36
+execute dump_waits_user;
+user	event_name	count_star
+user1	wait/io/table/sql/handler	0
+user1	wait/lock/table/sql/handler	36
+execute dump_waits_host;
+host	event_name	count_star
+localhost	wait/io/table/sql/handler	0
+localhost	wait/lock/table/sql/handler	36
+execute dump_waits_global;
+event_name	count_star
+wait/io/table/sql/handler	0
+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	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	0	0	0	0	0	0	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	0	0	0	0	0	0	0
+TABLE	test	t3	index_b	0	0	0	0	0	0	0
+TABLE	test	t3	index_cb	0	0	0	0	0	0	0
+TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
+execute 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	0	0	0	0	0	0	0
+TABLE	test	t2	0	0	0	0	0	0	0
+TABLE	test	t3	0	0	0	0	0	0	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	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	10
@@ -288,15 +341,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -306,10 +356,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	10	4	6	2	0	0	0	2	0	0	3
-TABLE	test	t2	12	4	8	2	0	0	0	2	0	0	4
-TABLE	test	t3	14	4	10	2	0	0	0	2	0	0	5
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	10
@@ -346,11 +396,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=201;
 update test.t2 set d=d+1 where a=201;
 update test.t3 set d=d+1 where a=201;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	2
 205	5	5	1
@@ -391,15 +441,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -409,10 +456,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -464,15 +511,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -482,10 +526,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	20	8	12	4	0	0	0	4	0	0	6
-TABLE	test	t2	24	8	16	4	0	0	0	4	0	0	8
-TABLE	test	t3	28	8	20	4	0	0	0	4	0	0	10
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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
 TABLE	test	t1	20
@@ -528,11 +572,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=301;
 update test.t2 set d=d+1 where a=301;
 update test.t3 set d=d+1 where a=301;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	3
 205	5	5	2
@@ -579,15 +623,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -597,10 +638,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -657,15 +698,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -675,10 +713,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	30	12	18	6	0	0	0	6	0	0	9
-TABLE	test	t2	36	12	24	6	0	0	0	6	0	0	12
-TABLE	test	t3	42	12	30	6	0	0	0	6	0	0	15
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	30
@@ -727,11 +765,11 @@ update test.t3 set d=d+1;
 update test.t1 set d=d+1 where a=401;
 update test.t2 set d=d+1 where a=401;
 update test.t3 set d=d+1 where a=401;
-select * from test.t1 where b=5;
+select * from test.t1 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t2 where b=5;
+select * from test.t2 force index(index_b) where b=5;
 a	b	c	d
-select * from test.t3 where b=5;
+select * from test.t3 force index(index_b) where b=5;
 a	b	c	d
 105	5	5	4
 205	5	5	3
@@ -784,15 +822,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -802,10 +837,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	40	16	24	8	0	0	0	8	0	0	12
-TABLE	test	t2	48	16	32	8	0	0	0	8	0	0	16
-TABLE	test	t3	56	16	40	8	0	0	0	8	0	0	20
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	40
@@ -863,15 +898,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -881,10 +913,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -939,15 +971,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -957,10 +986,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1015,15 +1044,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1033,10 +1059,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1088,15 +1114,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1106,10 +1129,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1160,15 +1183,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1178,10 +1198,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1231,15 +1251,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1249,10 +1266,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1301,15 +1318,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1319,10 +1333,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1373,15 +1387,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1391,10 +1402,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1444,15 +1455,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1462,10 +1470,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1515,15 +1523,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1533,10 +1538,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1586,15 +1591,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1604,10 +1606,10 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	44	18	26	8	0	0	1	9	0	0	13
-TABLE	test	t2	52	18	34	8	0	0	1	9	0	0	17
-TABLE	test	t3	60	18	42	8	0	0	1	9	0	0	21
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_with_shared_locks	count_read_high_priority	count_read_no_insert	count_read_external	count_write_low_priority	count_write_external
+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
 TABLE	test	t1	44
@@ -1657,15 +1659,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	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t2	NULL	0	0	0	0	0	0	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	0	0	0	0	0	0	0
-TABLE	test	t3	NULL	0	0	0	0	0	0	0
 TABLE	test	t3	index_b	0	0	0	0	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	0	0	0	0	0	0	0
@@ -1675,16 +1674,16 @@ TABLE	test	t1	0	0	0	0	0	0	0
 TABLE	test	t2	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	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_delayed	count_write_low_priority	count_write_external
-TABLE	test	t1	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t2	0	0	0	0	0	0	0	0	0	0	0
-TABLE	test	t3	0	0	0	0	0	0	0	0	0	0	0
+object_type	object_schema	object_name	count_star	count_read	count_write	count_read_normal	count_read_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	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	0
 TABLE	test	t2	0
 TABLE	test	t3	0
-show status like "performance_schema%";
+show global status like "performance_schema%";
 Variable_name	Value
 Performance_schema_accounts_lost	0
 Performance_schema_cond_classes_lost	0
@@ -1694,9 +1693,15 @@ 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
@@ -1706,6 +1711,7 @@ 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
diff --git a/mysql-test/suite/perfschema/r/table_name.result b/mysql-test/suite/perfschema/r/table_name.result
index d6369ffc79e..3ee335991d8 100644
--- a/mysql-test/suite/perfschema/r/table_name.result
+++ b/mysql-test/suite/perfschema/r/table_name.result
@@ -13,7 +13,8 @@ INSERT INTO `sql_1` VALUES(1,'one');
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
 TABLE	test	#sql_1
 TABLE	test	sql_1
@@ -25,7 +26,8 @@ DROP TABLE `sql_1`;
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
 
 #
@@ -41,7 +43,8 @@ INSERT INTO sql_temp2_innodb VALUES(1,'one');
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
 
 # Drop the tables, verify that the table objects are not created.
@@ -51,7 +54,8 @@ DROP TABLE sql_temp2_innodb;
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
 
 #
@@ -73,7 +77,8 @@ INSERT INTO `#sql_temp3_innodb` VALUES(1,'one');
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
 
 # Drop the temporary tables.
@@ -85,7 +90,8 @@ DROP TABLE `#sql_temp3_innodb`;
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
 
 #
@@ -102,7 +108,8 @@ INSERT INTO `#sql_temp4_myisam` VALUES(1,'one');
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
 
 # Truncate the MyISAM temporary tables, forcing them to be recreated as non-temporary.
@@ -114,7 +121,8 @@ TRUNCATE TABLE `#sql_temp4_myisam`;
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
 
 # Drop the recreated MyISAM tables;
@@ -126,7 +134,8 @@ DROP TABLE `#sql_temp4_myisam`;
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
 
 #
@@ -141,7 +150,8 @@ ALTER TABLE t1 ADD COLUMN (b int);
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
 
 # Drop the MyISAM table
@@ -152,5 +162,6 @@ DROP TABLE t1;
 
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
+WHERE object_schema="test"
+ORDER BY object_name;
 object_type	object_schema	object_name
diff --git a/mysql-test/suite/perfschema/r/table_schema.result b/mysql-test/suite/perfschema/r/table_schema.result
index 8caf2017fd2..e56ae8b5e0b 100644
--- a/mysql-test/suite/perfschema/r/table_schema.result
+++ b/mysql-test/suite/perfschema/r/table_schema.result
@@ -1,7 +1,7 @@
 select * from information_schema.columns where table_schema="performance_schema"
    order by table_name, ordinal_position;
 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
@@ -15,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
@@ -25,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
@@ -35,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
@@ -59,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
@@ -111,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
@@ -151,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
@@ -191,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
@@ -274,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
@@ -300,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
@@ -351,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
@@ -366,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
@@ -385,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
@@ -404,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
@@ -437,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
@@ -501,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
@@ -533,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
@@ -548,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
@@ -560,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
@@ -629,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
@@ -783,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
@@ -793,40 +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
-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 0e1bf01ef9a..a1b16c42108 100644
--- a/mysql-test/suite/perfschema/r/temp_table_io.result
+++ b/mysql-test/suite/perfschema/r/temp_table_io.result
@@ -70,36 +70,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
-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		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_%';
 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
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/r/thread_cache.result b/mysql-test/suite/perfschema/r/thread_cache.result
index daa9f318e7b..8c39f4ddca5 100644
--- a/mysql-test/suite/perfschema/r/thread_cache.result
+++ b/mysql-test/suite/perfschema/r/thread_cache.result
@@ -1,7 +1,7 @@
 flush status;
 SET @saved_thread_cache_size = @@global.thread_cache_size;
 set global thread_cache_size = 0;
-show variables like "thread_cache_size";
+show global variables like "thread_cache_size";
 Variable_name	Value
 thread_cache_size	0
 connect  con1, localhost, root, , ;
@@ -26,7 +26,7 @@ select @thread_id_increment;
 @thread_id_increment
 1
 set global thread_cache_size = 100;
-show variables like "thread_cache_size";
+show global variables like "thread_cache_size";
 Variable_name	Value
 thread_cache_size	100
 connect  con1, localhost, root, , ;
@@ -51,7 +51,7 @@ select @thread_id_increment;
 @thread_id_increment
 1
 set global thread_cache_size = @saved_thread_cache_size;
-show status like "performance_schema_thread%";
+show global status like "performance_schema_thread%";
 Variable_name	Value
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
diff --git a/mysql-test/suite/perfschema/r/thread_misc.result b/mysql-test/suite/perfschema/r/thread_misc.result
new file mode 100644
index 00000000000..31094e64b59
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/thread_misc.result
@@ -0,0 +1 @@
+select * from information_schema.columns ORDER BY table_name;
diff --git a/mysql-test/suite/perfschema/r/threads_history.result b/mysql-test/suite/perfschema/r/threads_history.result
new file mode 100644
index 00000000000..aaf2cd09e31
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/threads_history.result
@@ -0,0 +1,700 @@
+create user user1@localhost;
+create user user2@localhost;
+create user user3@localhost;
+create user user4@localhost;
+grant ALL on *.* to user1@localhost;
+grant ALL on *.* to user2@localhost;
+grant ALL on *.* to user3@localhost;
+grant ALL on *.* to user4@localhost;
+flush privileges;
+select * from performance_schema.setup_consumers;
+NAME	ENABLED
+events_stages_current	YES
+events_stages_history	YES
+events_stages_history_long	YES
+events_statements_current	YES
+events_statements_history	YES
+events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
+events_waits_current	YES
+events_waits_history	YES
+events_waits_history_long	YES
+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;
+truncate table performance_schema.events_statements_current;
+truncate table performance_schema.events_statements_history;
+truncate table performance_schema.events_statements_history_long;
+truncate table performance_schema.events_stages_current;
+truncate table performance_schema.events_stages_history;
+truncate table performance_schema.events_stages_history_long;
+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
+Hi from con1
+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
+Hi from con2
+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
+Hi from con3
+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
+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
+XID_FORMAT_ID	XID_GTRID	XID_BQUAL
+12	XA_CON1	XA_BQUAL
+XID_FORMAT_ID	XID_GTRID	XID_BQUAL
+12	XA_CON1	XA_BQUAL
+"=========================== Transactions user 2"
+XID_FORMAT_ID	XID_GTRID	XID_BQUAL
+12	XA_CON2	XA_BQUAL
+count(*)
+0
+count(*)
+0
+"=========================== Transactions user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Transactions user 4"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Statements user 1"
+EVENT_NAME	SQL_TEXT
+statement/sql/xa_commit	XA COMMIT 'XA_CON1', 'XA_BQUAL', 12
+EVENT_NAME	SQL_TEXT
+statement/sql/xa_start	XA START 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/select	select "Hi from con1"
+statement/sql/xa_end	XA END 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/xa_prepare	XA PREPARE 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/xa_commit	XA COMMIT 'XA_CON1', 'XA_BQUAL', 12
+EVENT_NAME	SQL_TEXT
+statement/sql/xa_start	XA START 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/select	select "Hi from con1"
+statement/sql/xa_end	XA END 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/xa_prepare	XA PREPARE 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/xa_commit	XA COMMIT 'XA_CON1', 'XA_BQUAL', 12
+"=========================== Statements user 2"
+EVENT_NAME	SQL_TEXT
+statement/sql/xa_commit	XA COMMIT 'XA_CON2', 'XA_BQUAL', 12
+count(*)
+0
+count(*)
+0
+"=========================== Statements user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Statements user 4"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== 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/Commit
+stage/sql/closing tables
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
+EVENT_NAME
+stage/sql/starting
+stage/sql/Query end
+stage/sql/Commit
+stage/sql/closing tables
+stage/sql/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 of update loop
+stage/sql/Query end
+stage/sql/Commit
+stage/sql/closing tables
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
+stage/sql/starting
+stage/sql/Query end
+stage/sql/Commit
+stage/sql/closing tables
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
+stage/sql/starting
+stage/sql/Query end
+stage/sql/Commit
+stage/sql/closing tables
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
+stage/sql/starting
+stage/sql/Query end
+stage/sql/Commit
+stage/sql/closing tables
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
+"=========================== Stages user 2"
+EVENT_NAME
+count(*)
+0
+count(*)
+0
+"=========================== Stages user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Stages user 4"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Waits user 1"
+EVENT_NAME
+idle
+has_waits
+1
+has_waits
+1
+"=========================== Waits user 2"
+EVENT_NAME
+idle
+count(*)
+0
+count(*)
+0
+"=========================== Waits user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Waits user 4"
+count(*)
+0
+count(*)
+0
+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;
+NAME	ENABLED
+events_stages_current	YES
+events_stages_history	NO
+events_stages_history_long	NO
+events_statements_current	YES
+events_statements_history	NO
+events_statements_history_long	NO
+events_transactions_current	YES
+events_transactions_history	NO
+events_transactions_history_long	NO
+events_waits_current	YES
+events_waits_history	NO
+events_waits_history_long	NO
+global_instrumentation	YES
+thread_instrumentation	YES
+statements_digest	YES
+truncate table performance_schema.events_transactions_current;
+truncate table performance_schema.events_transactions_history;
+truncate table performance_schema.events_transactions_history_long;
+truncate table performance_schema.events_statements_current;
+truncate table performance_schema.events_statements_history;
+truncate table performance_schema.events_statements_history_long;
+truncate table performance_schema.events_stages_current;
+truncate table performance_schema.events_stages_history;
+truncate table performance_schema.events_stages_history_long;
+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
+Hi from con1
+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
+Hi from con2
+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
+Hi from con3
+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
+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
+count(*)
+0
+count(*)
+0
+"=========================== Transactions user 2"
+XID_FORMAT_ID	XID_GTRID	XID_BQUAL
+12	XA_CON2	XA_BQUAL
+count(*)
+0
+count(*)
+0
+"=========================== Transactions user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Transactions user 4"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Statements user 1"
+EVENT_NAME	SQL_TEXT
+statement/sql/xa_commit	XA COMMIT 'XA_CON1', 'XA_BQUAL', 12
+count(*)
+0
+count(*)
+0
+"=========================== Statements user 2"
+EVENT_NAME	SQL_TEXT
+statement/sql/xa_commit	XA COMMIT 'XA_CON2', 'XA_BQUAL', 12
+count(*)
+0
+count(*)
+0
+"=========================== Statements user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Statements user 4"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Stages user 1"
+EVENT_NAME
+count(*)
+0
+count(*)
+0
+"=========================== Stages user 2"
+EVENT_NAME
+count(*)
+0
+count(*)
+0
+"=========================== Stages user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Stages user 4"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Waits user 1"
+EVENT_NAME
+idle
+has_waits
+0
+has_waits
+0
+"=========================== Waits user 2"
+EVENT_NAME
+idle
+count(*)
+0
+count(*)
+0
+"=========================== Waits user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Waits user 4"
+count(*)
+0
+count(*)
+0
+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;
+NAME	ENABLED
+events_stages_current	YES
+events_stages_history	YES
+events_stages_history_long	YES
+events_statements_current	YES
+events_statements_history	YES
+events_statements_history_long	YES
+events_transactions_current	YES
+events_transactions_history	YES
+events_transactions_history_long	YES
+events_waits_current	YES
+events_waits_history	YES
+events_waits_history_long	YES
+global_instrumentation	YES
+thread_instrumentation	YES
+statements_digest	YES
+truncate table performance_schema.events_transactions_current;
+truncate table performance_schema.events_transactions_history;
+truncate table performance_schema.events_transactions_history_long;
+truncate table performance_schema.events_statements_current;
+truncate table performance_schema.events_statements_history;
+truncate table performance_schema.events_statements_history_long;
+truncate table performance_schema.events_stages_current;
+truncate table performance_schema.events_stages_history;
+truncate table performance_schema.events_stages_history_long;
+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
+Hi from con1
+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
+Hi from con2
+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
+Hi from con3
+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
+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
+XID_FORMAT_ID	XID_GTRID	XID_BQUAL
+12	XA_CON1	XA_BQUAL
+XID_FORMAT_ID	XID_GTRID	XID_BQUAL
+12	XA_CON1	XA_BQUAL
+"=========================== Transactions user 2"
+XID_FORMAT_ID	XID_GTRID	XID_BQUAL
+12	XA_CON2	XA_BQUAL
+count(*)
+0
+count(*)
+0
+"=========================== Transactions user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Transactions user 4"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Statements user 1"
+EVENT_NAME	SQL_TEXT
+statement/sql/xa_commit	XA COMMIT 'XA_CON1', 'XA_BQUAL', 12
+EVENT_NAME	SQL_TEXT
+statement/sql/xa_start	XA START 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/select	select "Hi from con1"
+statement/sql/xa_end	XA END 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/xa_prepare	XA PREPARE 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/xa_commit	XA COMMIT 'XA_CON1', 'XA_BQUAL', 12
+EVENT_NAME	SQL_TEXT
+statement/sql/xa_start	XA START 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/select	select "Hi from con1"
+statement/sql/xa_end	XA END 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/xa_prepare	XA PREPARE 'XA_CON1', 'XA_BQUAL', 12
+statement/sql/xa_commit	XA COMMIT 'XA_CON1', 'XA_BQUAL', 12
+"=========================== Statements user 2"
+EVENT_NAME	SQL_TEXT
+statement/sql/xa_commit	XA COMMIT 'XA_CON2', 'XA_BQUAL', 12
+count(*)
+0
+count(*)
+0
+"=========================== Statements user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Statements user 4"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== 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/Commit
+stage/sql/closing tables
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
+EVENT_NAME
+stage/sql/starting
+stage/sql/Query end
+stage/sql/Commit
+stage/sql/closing tables
+stage/sql/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 of update loop
+stage/sql/Query end
+stage/sql/Commit
+stage/sql/closing tables
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
+stage/sql/starting
+stage/sql/Query end
+stage/sql/Commit
+stage/sql/closing tables
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
+stage/sql/starting
+stage/sql/Query end
+stage/sql/Commit
+stage/sql/closing tables
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
+stage/sql/starting
+stage/sql/Query end
+stage/sql/Commit
+stage/sql/closing tables
+stage/sql/Starting cleanup
+stage/sql/Freeing items
+stage/sql/Reset for next command
+"=========================== Stages user 2"
+EVENT_NAME
+count(*)
+0
+count(*)
+0
+"=========================== Stages user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Stages user 4"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Waits user 1"
+EVENT_NAME
+idle
+has_waits
+1
+has_waits
+1
+"=========================== Waits user 2"
+EVENT_NAME
+idle
+count(*)
+0
+count(*)
+0
+"=========================== Waits user 3"
+count(*)
+0
+count(*)
+0
+count(*)
+0
+"=========================== Waits user 4"
+count(*)
+0
+count(*)
+0
+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;
+revoke all privileges, grant option from user4@localhost;
+drop user user1@localhost;
+drop user user2@localhost;
+drop user user3@localhost;
+drop user user4@localhost;
+flush privileges;
+truncate table performance_schema.setup_actors;
+insert into performance_schema.setup_actors
+values ('%', '%', '%', 'YES', 'YES');
+select * from performance_schema.setup_actors;
+HOST	USER	ROLE	ENABLED	HISTORY
+%	%	%	YES	YES
diff --git a/mysql-test/suite/perfschema/r/threads_mysql_freebsd.result b/mysql-test/suite/perfschema/r/threads_mysql_freebsd.result
new file mode 100644
index 00000000000..36158d06406
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/threads_mysql_freebsd.result
@@ -0,0 +1,3 @@
+SELECT THREAD_ID, NAME, THREAD_OS_ID from performance_schema.threads
+WHERE THREAD_OS_ID is NULL;
+THREAD_ID	NAME	THREAD_OS_ID
diff --git a/mysql-test/suite/perfschema/r/threads_mysql_linux.result b/mysql-test/suite/perfschema/r/threads_mysql_linux.result
new file mode 100644
index 00000000000..36158d06406
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/threads_mysql_linux.result
@@ -0,0 +1,3 @@
+SELECT THREAD_ID, NAME, THREAD_OS_ID from performance_schema.threads
+WHERE THREAD_OS_ID is NULL;
+THREAD_ID	NAME	THREAD_OS_ID
diff --git a/mysql-test/suite/perfschema/r/threads_mysql_windows.result b/mysql-test/suite/perfschema/r/threads_mysql_windows.result
new file mode 100644
index 00000000000..36158d06406
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/threads_mysql_windows.result
@@ -0,0 +1,3 @@
+SELECT THREAD_ID, NAME, THREAD_OS_ID from performance_schema.threads
+WHERE THREAD_OS_ID is NULL;
+THREAD_ID	NAME	THREAD_OS_ID
diff --git a/mysql-test/suite/perfschema/r/transaction.result b/mysql-test/suite/perfschema/r/transaction.result
new file mode 100644
index 00000000000..56c50d14879
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/transaction.result
@@ -0,0 +1,680 @@
+set global binlog_format=ROW;
+
+========================================================================
+STEP 1 - SETUP
+========================================================================
+
+# Control thread
+
+connection default;
+SET SESSION AUTOCOMMIT= 1;
+SELECT thread_id INTO @my_thread_id
+FROM performance_schema.threads
+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;
+CREATE TABLE nt1 (s1 int, s2 varchar(64)) ENGINE=MYISAM;
+
+# Disable all events from the control thread
+
+
+# Clear transaction tables
+
+CALL clear_transaction_tables();
+
+========================================================================
+# STEP 2 - BASIC TRANSACTION
+========================================================================
+
+connection con1;
+SELECT @@global.tx_isolation;
+@@global.tx_isolation
+REPEATABLE-READ
+SELECT @@global.autocommit;
+@@global.autocommit
+1
+SELECT @@global.binlog_format;
+@@global.binlog_format
+ROW
+SELECT @@tx_isolation;
+@@tx_isolation
+REPEATABLE-READ
+SELECT @@autocommit;
+@@autocommit
+0
+SELECT @@binlog_format;
+@@binlog_format
+ROW
+
+# STEP 2.1 - START/COMMIT
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (101, 'COMMITTED');
+COMMIT;
+
+# STEP 2.2 - ROLLBACK
+
+START TRANSACTION;
+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
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'ROLLED BACK', 0, '', '', '', '', 'READ WRITE', 'REPEATABLE READ', 'NO', 0, 0, 0, 1);
+ACTUAL	EXPECTED
+     1	       1
+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;
+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
+CALL clear_transaction_tables();
+
+========================================================================
+# STEP 3 - ISOLATION LEVEL
+========================================================================
+
+connection con1
+connection con1;
+SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+START TRANSACTION;
+INSERT INTO t1 VALUES (301, 'SERIALIZABLE');
+COMMIT;
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+START TRANSACTION;
+INSERT INTO t1 VALUES (302, 'REPEATABLE READ');
+COMMIT;
+SELECT @@binlog_format INTO @binlog_save;
+SET SESSION BINLOG_FORMAT=ROW;
+SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
+START TRANSACTION;
+INSERT INTO t1 VALUES (303, 'READ COMMITTED');
+COMMIT;
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+START TRANSACTION;
+INSERT INTO t1 VALUES (304, 'READ UNCOMMITTED');
+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
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', 'REPEATABLE READ', 'NO', 0, 0, 0, 1);
+ACTUAL	EXPECTED
+     1	       1
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', 'READ COMMITTED', 'NO', 0, 0, 0, 1);
+ACTUAL	EXPECTED
+     1	       1
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', 'READ UNCOMMITTED', 'NO', 0, 0, 0, 1);
+ACTUAL	EXPECTED
+     1	       1
+CALL clear_transaction_tables();
+
+========================================================================
+# STEP 4 - ACCESS MODE
+========================================================================
+#
+# STEP 4.1 - READ ONLY, TIMING ENABLED
+#
+
+connection con1
+connection con1;
+SET SESSION TRANSACTION READ WRITE;
+START TRANSACTION;
+INSERT INTO t1 VALUES (410, 'READ ONLY');
+INSERT INTO t1 VALUES (411, 'READ ONLY');
+INSERT INTO t1 VALUES (412, 'READ ONLY');
+INSERT INTO t1 VALUES (413, 'READ ONLY');
+COMMIT;
+SET SESSION TRANSACTION READ ONLY;
+START TRANSACTION;
+SELECT * FROM t1 ORDER BY s1;
+s1	s2
+101	COMMITTED
+103	COMMIT AND CHAIN
+104	COMMIT AND CHAIN
+301	SERIALIZABLE
+302	REPEATABLE READ
+303	READ COMMITTED
+304	READ UNCOMMITTED
+410	READ ONLY
+411	READ ONLY
+412	READ ONLY
+413	READ ONLY
+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
+CALL clear_transaction_tables();
+
+#
+# STEP 4.2 - READ ONLY, TIMING DISABLED
+#
+
+## Disable timing stats for 'transaction'
+UPDATE performance_schema.setup_instruments SET timed = 'NO' WHERE name = 'transaction';
+
+TRUNCATE performance_schema.events_transactions_summary_global_by_event_name;
+connection con1
+connection con1;
+START TRANSACTION;
+SELECT * FROM t1 ORDER BY s1;
+s1	s2
+101	COMMITTED
+103	COMMIT AND CHAIN
+104	COMMIT AND CHAIN
+301	SERIALIZABLE
+302	REPEATABLE READ
+303	READ COMMITTED
+304	READ UNCOMMITTED
+410	READ ONLY
+411	READ ONLY
+412	READ ONLY
+413	READ ONLY
+COMMIT;
+
+SET SESSION TRANSACTION READ WRITE;
+connection default;
+
+## Expect 1 event, 0 stats
+SELECT * FROM performance_schema.events_transactions_summary_global_by_event_name;
+EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ_WRITE	SUM_TIMER_READ_WRITE	MIN_TIMER_READ_WRITE	AVG_TIMER_READ_WRITE	MAX_TIMER_READ_WRITE	COUNT_READ_ONLY	SUM_TIMER_READ_ONLY	MIN_TIMER_READ_ONLY	AVG_TIMER_READ_ONLY	MAX_TIMER_READ_ONLY
+transaction	1	0	0	0	0	0	0	0	0	0	1	0	0	0	0
+
+## Restore setup_instruments
+UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name = 'transaction';
+
+========================================================================
+# STEP 5 - IMPLICIT START
+========================================================================
+# When AUTOCOMMIT is disabled, the first statement following a committed
+# 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
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+ACTUAL	EXPECTED
+     1	       1
+CALL clear_transaction_tables();
+
+========================================================================
+# STEP 6 - IMPLICIT COMMIT (DDL, ETC)
+========================================================================
+# 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
+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);
+ACTUAL	EXPECTED
+     1	       1
+CALL clear_transaction_tables();
+DROP TABLE test.t2;
+
+========================================================================
+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
+
+#
+# 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
+
+#
+# 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
+CALL transaction_verifier(1, @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
+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
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'ROLLED BACK', 0, 'XA_CON1_002', '', 'ROLLBACK ONLY', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+ACTUAL	EXPECTED
+     1	       1
+CALL clear_transaction_tables();
+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
+#
+# 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;
+XA PREPARE 'GTRID_6789012345678901234567890123456789012345678901234567890123','BQUAL_6789012345678901234567890123456789012345678901234567890123',1234567890;
+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
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 1234567890, 'GTRID_6789012345678901234567890123456789012345678901234567890123', 'BQUAL_6789012345678901234567890123456789012345678901234567890123', 'COMMITTED', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+ACTUAL	EXPECTED
+     1	       1
+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;
+XA PREPARE 'GTRID_6789012345678901234567890123456789012345678901234567890123',0x425155414C5FA5A53839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233,1234567890;
+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
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 1234567890, 'GTRID_6789012345678901234567890123456789012345678901234567890123', '0x425155414C5FA5A53839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233', 'COMMITTED', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+ACTUAL	EXPECTED
+     1	       1
+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
+
+#
+# STEP 8.1 - UPDATE NON-TRANSACTIONAL TABLE
+#
+INSERT INTO nt1 VALUES (801, 'NON-TRANSACTIONAL');
+
+## Expect 0 transactions in events_transactions_current
+connection default;
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
+ACTUAL	EXPECTED
+     1	       1
+connection con1;
+COMMIT;
+
+## Expect 0 transactions in events_transactions_history
+connection default;
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
+ACTUAL	EXPECTED
+     1	       1
+
+#
+# STEP 8.2 - UPDATE TRANSACTIONAL AND NON-TRANSACTIONAL TABLES
+#
+
+## First non-transactional...
+
+connection con1;
+INSERT INTO nt1 VALUES (802, 'NON-TRANSACTIONAL');
+
+## Expect 0 transactions in events_transactions_current
+connection default;
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
+ACTUAL	EXPECTED
+     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+@mariadb_bug);
+ACTUAL	EXPECTED
+     2	       2
+CALL clear_transaction_tables();
+
+========================================================================
+# STEP 9 - SAVEPOINTS
+========================================================================
+#
+# 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
+
+#
+# STEP 9.2 - SAVEPOINTS 2 and 3
+#
+connection con1;
+INSERT INTO t1 VALUES (902, 'SAVEPOINT');
+SAVEPOINT SVP002;
+INSERT INTO t1 VALUES (903, 'SAVEPOINT');
+SAVEPOINT SVP003;
+INSERT INTO t1 VALUES (904, 'SAVEPOINT');
+SELECT COUNT(*) FROM t1 WHERE s1 > 900;
+COUNT(*)
+4
+
+#
+# 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
+
+#
+# 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
+CALL clear_transaction_tables();
+
+========================================================================
+# STEP 10 - GTIDs
+========================================================================
+GTIDs are tested in transaction_gtid.test.
+
+========================================================================
+# STEP 11 - MISCELLANY
+========================================================================
+#
+# STEP 11.1 - TRUNCATE DURING ACTIVE TRANSACTION
+#
+
+# Verify that truncating events_transactions_current during an active transaction
+# 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;
+
+START TRANSACTION;
+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
+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
+FROM performance_schema.events_transactions_summary_global_by_event_name
+WHERE count_star = 1 and sum_timer_wait != 0;
+EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	COUNT_READ_WRITE
+
+## Disable timing stats for 'transaction'
+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;
+EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	COUNT_READ_WRITE	SUM_TIMER_READ_WRITE	MIN_TIMER_READ_WRITE	AVG_TIMER_READ_WRITE	MAX_TIMER_READ_WRITE	COUNT_READ_ONLY	SUM_TIMER_READ_ONLY	MIN_TIMER_READ_ONLY	AVG_TIMER_READ_ONLY	MAX_TIMER_READ_ONLY
+transaction	1	0	0	0	0	1	0	0	0	0	0	0	0	0	0
+
+## Restore setup_consumers and setup_instruments
+UPDATE performance_schema.setup_consumers SET enabled = 'YES' WHERE name = 'thread_instrumentation';
+UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name = 'transaction';
+
+DELETE FROM t1;
+CALL clear_history();
+
+#
+# STEP 11.3 - STATEMENT ROLLBACK - AUTOCOMMIT OFF - BINLOG FORMAT 'STATEMENT'
+#
+connection con1;
+SET SESSION binlog_format = STATEMENT;
+SET SESSION AUTOCOMMIT = 0;
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (1130, 'INSERT 1130');
+
+## Expect binlog statement mode error
+UPDATE t1, performance_schema.setup_instruments pfs
+SET t1.s1 = 1, pfs.timed = 'NO';
+
+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
+
+DELETE FROM t1;
+CALL clear_history();
+
+#
+# STEP 11.4 - STATEMENT ROLLBACK - AUTOCOMMIT ON - BINLOG FORMAT 'STATEMENT'
+#
+connection con1;
+SET SESSION binlog_format = STATEMENT;
+SET SESSION AUTOCOMMIT = 1;
+
+## Expect binlog statement mode error
+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
+CALL clear_history();
+
+========================================================================
+# CLEAN UP
+========================================================================
+
+disconnect con1;
+connection default;
+DROP TABLE t1;
+DROP TABLE nt1;
+DROP PROCEDURE clear_transaction_tables;
+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_gtid.result b/mysql-test/suite/perfschema/r/transaction_gtid.result
new file mode 100644
index 00000000000..ed0d743444f
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/transaction_gtid.result
@@ -0,0 +1,171 @@
+include/rpl_init.inc [topology=none]
+==== Configure ====
+SET GLOBAL ENFORCE_GTID_CONSISTENCY = ON;
+CREATE TABLE t1 (a INT);
+==== Test ====
+---- Case 1: Specify ANONYMOUS prior to transaction ----
+* BEGIN ... ROLLBACK
+- history=none current=none
+SET SESSION GTID_NEXT = 'ANONYMOUS';
+BEGIN;
+INSERT INTO t1 VALUES (1);
+ROLLBACK;
+- history=ANONYMOUS current=ANONYMOUS
+* BEGIN ... COMMIT
+- history=none current=none
+SET SESSION GTID_NEXT = 'ANONYMOUS';
+- history=none current=none
+[START] BEGIN;
+- history=none current=AUTOMATIC
+[END] BEGIN;
+- history=none current=ANONYMOUS
+INSERT INTO t1 VALUES (1);
+- history=none current=ANONYMOUS
+COMMIT;
+- history=ANONYMOUS current=ANONYMOUS
+* AUTOCOMMIT = OFF
+SET @@SESSION.AUTOCOMMIT = 0;
+- history=none current=none
+SET SESSION GTID_NEXT = 'ANONYMOUS';
+- history=none current=none
+[START] INSERT INTO t1 VALUES (1);
+- history=none current=ANONYMOUS
+[END] INSERT INTO t1 VALUES (1);
+- history=none current=ANONYMOUS
+COMMIT;
+- history=ANONYMOUS current=ANONYMOUS
+* AUTOCOMMIT = ON
+SET @@SESSION.AUTOCOMMIT = 1;
+- history=none current=none
+SET SESSION GTID_NEXT = 'ANONYMOUS';
+- history=none current=none
+[START] INSERT INTO t1 VALUES (1);
+- history=none current=ANONYMOUS
+[END] INSERT INTO t1 VALUES (1);
+- history=ANONYMOUS current=ANONYMOUS
+---- Case 2: Generate ANONYMOUS at commit ----
+* BEGIN ... ROLLBACK
+- history=none current=none
+SET SESSION GTID_NEXT = 'AUTOMATIC';
+BEGIN;
+INSERT INTO t1 VALUES (2);
+ROLLBACK;
+- history=AUTOMATIC current=AUTOMATIC
+* BEGIN ... COMMIT
+- history=none current=none
+SET SESSION GTID_NEXT = 'AUTOMATIC';
+- history=none current=none
+[START] BEGIN;
+- history=none current=AUTOMATIC
+[END] BEGIN;
+- history=none current=AUTOMATIC
+INSERT INTO t1 VALUES (2);
+- history=none current=AUTOMATIC
+COMMIT;
+- history=ANONYMOUS current=ANONYMOUS
+* AUTOCOMMIT = OFF
+SET @@SESSION.AUTOCOMMIT = 0;
+- history=none current=none
+SET SESSION GTID_NEXT = 'AUTOMATIC';
+- history=none current=none
+[START] INSERT INTO t1 VALUES (2);
+- history=none current=AUTOMATIC
+[END] INSERT INTO t1 VALUES (2);
+- history=none current=AUTOMATIC
+COMMIT;
+- history=ANONYMOUS current=ANONYMOUS
+* AUTOCOMMIT = ON
+SET @@SESSION.AUTOCOMMIT = 1;
+- history=none current=none
+SET SESSION GTID_NEXT = 'AUTOMATIC';
+- history=none current=none
+[START] INSERT INTO t1 VALUES (2);
+- history=none current=AUTOMATIC
+[END] INSERT INTO t1 VALUES (2);
+- history=ANONYMOUS current=ANONYMOUS
+include/rpl_set_gtid_mode.inc [ON on servers 1]
+---- Case 3: Specify GTID prior to transaction ----
+* BEGIN ... ROLLBACK
+- history=none current=none
+SET SESSION GTID_NEXT = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
+BEGIN;
+INSERT INTO t1 VALUES (3);
+ROLLBACK;
+- history=A:1 current=A:1
+* BEGIN ... COMMIT
+- history=none current=none
+SET SESSION GTID_NEXT = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
+- history=none current=none
+[START] BEGIN;
+- history=none current=AUTOMATIC
+[END] BEGIN;
+- history=none current=A:1
+INSERT INTO t1 VALUES (3);
+- history=none current=A:1
+COMMIT;
+- history=A:1 current=A:1
+* AUTOCOMMIT = OFF
+SET @@SESSION.AUTOCOMMIT = 0;
+- history=none current=none
+SET SESSION GTID_NEXT = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
+- history=none current=none
+[START] INSERT INTO t1 VALUES (3);
+- history=none current=A:1
+[END] INSERT INTO t1 VALUES (3);
+- history=none current=A:1
+COMMIT;
+- history=A:1 current=A:1
+* AUTOCOMMIT = ON
+SET @@SESSION.AUTOCOMMIT = 1;
+- history=none current=none
+SET SESSION GTID_NEXT = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1';
+- history=none current=none
+[START] INSERT INTO t1 VALUES (3);
+- history=none current=A:1
+[END] INSERT INTO t1 VALUES (3);
+- history=A:1 current=A:1
+---- Case 4: Generate GTID at commit ----
+* BEGIN ... ROLLBACK
+- history=none current=none
+SET SESSION GTID_NEXT = 'AUTOMATIC';
+BEGIN;
+INSERT INTO t1 VALUES (4);
+ROLLBACK;
+- history=AUTOMATIC current=AUTOMATIC
+* BEGIN ... COMMIT
+- history=none current=none
+SET SESSION GTID_NEXT = 'AUTOMATIC';
+- history=none current=none
+[START] BEGIN;
+- history=none current=AUTOMATIC
+[END] BEGIN;
+- history=none current=AUTOMATIC
+INSERT INTO t1 VALUES (4);
+- history=none current=AUTOMATIC
+COMMIT;
+- history=SERVER_UUID:1 current=SERVER_UUID:1
+* AUTOCOMMIT = OFF
+SET @@SESSION.AUTOCOMMIT = 0;
+- history=none current=none
+SET SESSION GTID_NEXT = 'AUTOMATIC';
+- history=none current=none
+[START] INSERT INTO t1 VALUES (4);
+- history=none current=AUTOMATIC
+[END] INSERT INTO t1 VALUES (4);
+- history=none current=AUTOMATIC
+COMMIT;
+- history=SERVER_UUID:1 current=SERVER_UUID:1
+* AUTOCOMMIT = ON
+SET @@SESSION.AUTOCOMMIT = 1;
+- history=none current=none
+SET SESSION GTID_NEXT = 'AUTOMATIC';
+- history=none current=none
+[START] INSERT INTO t1 VALUES (4);
+- history=none current=AUTOMATIC
+[END] INSERT INTO t1 VALUES (4);
+- history=SERVER_UUID:1 current=SERVER_UUID:1
+==== Clean up ====
+DROP TABLE t1;
+include/rpl_set_gtid_mode.inc [OFF on servers 1]
+SET GLOBAL ENFORCE_GTID_CONSISTENCY = OFF;
+include/rpl_end.inc
diff --git a/mysql-test/suite/perfschema/r/transaction_nested_events.result b/mysql-test/suite/perfschema/r/transaction_nested_events.result
new file mode 100644
index 00000000000..62152f2c2cf
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/transaction_nested_events.result
@@ -0,0 +1,1258 @@
+
+#========================================================================
+# STEP 1 - SETUP
+#========================================================================
+
+## Setup control thread
+
+connection default;
+SET SESSION AUTOCOMMIT= 1;
+USE test;
+DROP DATABASE IF EXISTS db;
+
+## Create test database, test tables, one transactional and one non-transactional
+CREATE DATABASE db;
+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();
+SET @all_threads= 0;
+
+## Enable only transaction and statement instruments
+UPDATE performance_schema.setup_instruments SET enabled='NO', timed='NO';
+UPDATE performance_schema.setup_instruments SET enabled='YES'
+  WHERE name LIKE ('statement/%') OR name = 'transaction';
+
+## Clear statement and transaction history
+CALL test.clear_history();
+
+#========================================================================
+# STEP 2 - BASIC TRANSACTION
+#========================================================================
+#
+# 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         
+thread_id	          6	          6	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                  5	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/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")
+thread_id	          5	          6	statement/sql/insert          	NULL        	               NULL	NULL              	    0	INSERT INTO t1 VALUES (212, "INSERT 212")
+thread_id	          7	          8	statement/sql/update          	NULL        	               NULL	NULL              	    0	UPDATE t1 SET s1 = s1 + 1 WHERE s1 = 212
+
+## Combined statement and transaction event history ordered by event id
+
+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>
+thread_id	          3	          4	statement/sql/insert     	               NULL	NULL              	INSERT INTO t1 VALUES (211, "INSERT 211")
+thread_id	          4	          4	transaction              	                  3	STATEMENT         	<transaction started>
+thread_id	          5	          6	statement/sql/insert     	               NULL	NULL              	INSERT INTO t1 VALUES (212, "INSERT 212")
+thread_id	          6	          6	transaction              	                  5	STATEMENT         	<transaction started>
+thread_id	          7	          8	statement/sql/update     	               NULL	NULL              	UPDATE t1 SET s1 = s1 + 1 WHERE s1 = 212
+thread_id	          8	          8	transaction              	                  7	STATEMENT         	<transaction started>
+
+## 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")
+thread_id	          4	          4	statement/sql/update          	NULL        	                  2	TRANSACTION       	    0	UPDATE t1 SET s2 = "UPDATE 221" WHERE s1 = 221
+thread_id	          5	          5	statement/sql/commit          	NULL        	                  2	TRANSACTION       	    0	COMMIT
+
+## Combined statement and transaction event history ordered by event id
+
+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>
+thread_id	          3	          3	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (220, "INSERT 220"), (221, "INSERT 221")
+thread_id	          4	          4	statement/sql/update     	                  2	TRANSACTION       	UPDATE t1 SET s2 = "UPDATE 221" WHERE s1 = 221
+thread_id	          5	          5	statement/sql/commit     	                  2	TRANSACTION       	COMMIT
+
+## Clear statement and transaction history
+CALL test.clear_history();
+CALL test.clear_history();
+## Reset db.t1
+DELETE FROM db.t1;
+
+#========================================================================
+# STEP 3 - TRANSACTIONS AND STORED PROCEDURES
+#========================================================================
+#
+# STEP 3.1 - STORED PROCEDURE STARTED WITHIN TRANSACTION
+#
+connection con1;
+CREATE PROCEDURE tp_update() UPDATE t1 SET s1 = s1 + 1;
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (310, "INSERT 310");
+INSERT INTO t1 VALUES (311, "INSERT 311");
+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
+thread_id	          4	          4	statement/sql/insert          	NULL        	                  3	TRANSACTION       	    0	INSERT INTO t1 VALUES (310, "INSERT 310")
+thread_id	          5	          5	statement/sql/insert          	NULL        	                  3	TRANSACTION       	    0	INSERT INTO t1 VALUES (311, "INSERT 311")
+thread_id	          6	          6	statement/sql/insert          	NULL        	                  3	TRANSACTION       	    0	INSERT INTO t1 VALUES (312, "INSERT 312")
+thread_id	          7	          7	statement/sql/insert          	NULL        	                  3	TRANSACTION       	    0	INSERT INTO t1 VALUES (313, "INSERT 313")
+thread_id	          8	          9	statement/sql/call_procedure  	NULL        	                  3	TRANSACTION       	    0	CALL tp_update()
+thread_id	          9	          9	statement/sp/stmt             	tp_update   	                  8	STATEMENT         	    1	UPDATE t1 SET s1 = s1 + 1
+thread_id	         10	         10	statement/sql/commit          	NULL        	                  3	TRANSACTION       	    0	COMMIT
+
+## Combined statement and transaction event history ordered by event id
+
+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
+thread_id	          3	         10	transaction              	                  2	STATEMENT         	<transaction started>
+thread_id	          4	          4	statement/sql/insert     	                  3	TRANSACTION       	INSERT INTO t1 VALUES (310, "INSERT 310")
+thread_id	          5	          5	statement/sql/insert     	                  3	TRANSACTION       	INSERT INTO t1 VALUES (311, "INSERT 311")
+thread_id	          6	          6	statement/sql/insert     	                  3	TRANSACTION       	INSERT INTO t1 VALUES (312, "INSERT 312")
+thread_id	          7	          7	statement/sql/insert     	                  3	TRANSACTION       	INSERT INTO t1 VALUES (313, "INSERT 313")
+thread_id	          8	          9	statement/sql/call_proced	                  3	TRANSACTION       	CALL tp_update()
+thread_id	          9	          9	statement/sp/stmt        	                  8	STATEMENT         	UPDATE t1 SET s1 = s1 + 1
+thread_id	         10	         10	statement/sql/commit     	                  3	TRANSACTION       	COMMIT
+
+## 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();
+INSERT INTO t1 VALUES (320, "INSERT 320"),(321, "INSERT 321");
+INSERT INTO t1 VALUES (322, "INSERT 322"),(323, "INSERT 323");
+UPDATE t1 SET s1 = s1 + 1 WHERE s1 > 320;
+
+SELECT * FROM t1 ORDER BY s1;
+s1	s2
+320	INSERT 320
+322	INSERT 321
+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()
+thread_id	          3	          4	statement/sp/stmt             	tp_start    	                  2	STATEMENT         	    1	START TRANSACTION
+thread_id	          5	          5	statement/sql/insert          	NULL        	                  4	TRANSACTION       	    0	INSERT INTO t1 VALUES (320, "INSERT 320"),(321, "INSERT 321")
+thread_id	          6	          6	statement/sql/insert          	NULL        	                  4	TRANSACTION       	    0	INSERT INTO t1 VALUES (322, "INSERT 322"),(323, "INSERT 323")
+thread_id	          7	          7	statement/sql/update          	NULL        	                  4	TRANSACTION       	    0	UPDATE t1 SET s1 = s1 + 1 WHERE s1 > 320
+thread_id	          8	          8	statement/sql/select          	NULL        	                  4	TRANSACTION       	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	          9	          9	statement/sql/commit          	NULL        	                  4	TRANSACTION       	    0	COMMIT
+
+## Combined statement and transaction event history ordered by event id
+
+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()
+thread_id	          3	          4	statement/sp/stmt        	                  2	STATEMENT         	START TRANSACTION
+thread_id	          4	          9	transaction              	                  3	STATEMENT         	<transaction started>
+thread_id	          5	          5	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (320, "INSERT 320"),(321, "INSERT 321")
+thread_id	          6	          6	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (322, "INSERT 322"),(323, "INSERT 323")
+thread_id	          7	          7	statement/sql/update     	                  4	TRANSACTION       	UPDATE t1 SET s1 = s1 + 1 WHERE s1 > 320
+thread_id	          8	          8	statement/sql/select     	                  4	TRANSACTION       	SELECT * FROM t1 ORDER BY s1
+thread_id	          9	          9	statement/sql/commit     	                  4	TRANSACTION       	COMMIT
+
+## 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;
+
+## COMMIT within stored procedure
+START TRANSACTION;
+INSERT INTO t1 VALUES (330, "INSERT 330"),(331, "INSERT 331");
+INSERT INTO t1 VALUES (332, "INSERT 332"),(333, "INSERT 333");
+DELETE FROM t1 WHERE s1 > 331;
+CALL tp_commit();
+
+SELECT * FROM t1 ORDER BY s1;
+s1	s2
+330	INSERT 330
+331	INSERT 331
+
+## ROLLBACK within stored procedure
+START TRANSACTION;
+UPDATE t1 SET s1 = s1*2 WHERE s1 > 331;
+CALL tp_rollback();
+
+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         
+thread_id	         13	         16	transaction	ROLLED BACK	READ WRITE 	REPEATABLE READ 	NO  	                 12	STATEMENT         
+thread_id	         18	         18	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 17	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_rollback() ROLLBACK
+thread_id	          2	          2	statement/sql/create_procedure	NULL        	               NULL	NULL              	    0	CREATE PROCEDURE tp_commit() COMMIT
+thread_id	          3	          4	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
+thread_id	          5	          5	statement/sql/insert          	NULL        	                  4	TRANSACTION       	    0	INSERT INTO t1 VALUES (330, "INSERT 330"),(331, "INSERT 331")
+thread_id	          6	          6	statement/sql/insert          	NULL        	                  4	TRANSACTION       	    0	INSERT INTO t1 VALUES (332, "INSERT 332"),(333, "INSERT 333")
+thread_id	          7	          7	statement/sql/delete          	NULL        	                  4	TRANSACTION       	    0	DELETE FROM t1 WHERE s1 > 331
+thread_id	          8	          9	statement/sql/call_procedure  	NULL        	                  4	TRANSACTION       	    0	CALL tp_commit()
+thread_id	          9	          9	statement/sp/stmt             	tp_commit   	                  8	STATEMENT         	    1	COMMIT
+thread_id	         10	         11	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	         12	         13	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
+thread_id	         14	         14	statement/sql/update          	NULL        	                 13	TRANSACTION       	    0	UPDATE t1 SET s1 = s1*2 WHERE s1 > 331
+thread_id	         15	         16	statement/sql/call_procedure  	NULL        	                 13	TRANSACTION       	    0	CALL tp_rollback()
+thread_id	         16	         16	statement/sp/stmt             	tp_rollback 	                 15	STATEMENT         	    1	ROLLBACK
+thread_id	         17	         18	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
+
+## Combined statement and transaction event history ordered by event id
+
+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
+thread_id	          3	          4	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
+thread_id	          4	          9	transaction              	                  3	STATEMENT         	<transaction started>
+thread_id	          5	          5	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (330, "INSERT 330"),(331, "INSERT 331")
+thread_id	          6	          6	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (332, "INSERT 332"),(333, "INSERT 333")
+thread_id	          7	          7	statement/sql/delete     	                  4	TRANSACTION       	DELETE FROM t1 WHERE s1 > 331
+thread_id	          8	          9	statement/sql/call_proced	                  4	TRANSACTION       	CALL tp_commit()
+thread_id	          9	          9	statement/sp/stmt        	                  8	STATEMENT         	COMMIT
+thread_id	         10	         11	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
+thread_id	         11	         11	transaction              	                 10	STATEMENT         	<transaction started>
+thread_id	         12	         13	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
+thread_id	         13	         16	transaction              	                 12	STATEMENT         	<transaction started>
+thread_id	         14	         14	statement/sql/update     	                 13	TRANSACTION       	UPDATE t1 SET s1 = s1*2 WHERE s1 > 331
+thread_id	         15	         16	statement/sql/call_proced	                 13	TRANSACTION       	CALL tp_rollback()
+thread_id	         16	         16	statement/sp/stmt        	                 15	STATEMENT         	ROLLBACK
+thread_id	         17	         18	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
+thread_id	         18	         18	transaction              	                 17	STATEMENT         	<transaction started>
+
+## Clear statement and transaction history
+CALL test.clear_history();
+CALL test.clear_history();
+## Reset db.t1
+DELETE FROM db.t1;
+
+#========================================================================
+# STEP 4 - TRANSACTIONS AND STORED FUNCTIONS
+#========================================================================
+
+#
+# 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");
+RETURN x+y;
+END |
+
+## Clear history
+connection default;
+CALL test.clear_history();
+connection con1;
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (410, "INSERT 410");
+INSERT INTO t1 VALUES (411, "INSERT 411");
+INSERT INTO t1 VALUES (412, "INSERT 412");
+DELETE FROM t1 WHERE s1 > 410;
+
+SELECT * FROM t1 ORDER BY s1;
+s1	s2
+410	INSERT 410
+
+SELECT fn_add(413, 414);
+fn_add(413, 414)
+827
+COMMIT;
+
+SELECT * FROM t1 ORDER BY s1;
+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")
+thread_id	          4	          4	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (411, "INSERT 411")
+thread_id	          5	          5	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (412, "INSERT 412")
+thread_id	          6	          6	statement/sql/delete          	NULL        	                  2	TRANSACTION       	    0	DELETE FROM t1 WHERE s1 > 410
+thread_id	          7	          7	statement/sql/select          	NULL        	                  2	TRANSACTION       	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	          8	         10	statement/sql/select          	NULL        	                  2	TRANSACTION       	    0	SELECT fn_add(413, 414)
+thread_id	          9	          9	statement/sp/stmt             	fn_add      	                  8	STATEMENT         	    1	INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y")
+thread_id	         10	         10	statement/sp/freturn          	fn_add      	                  8	STATEMENT         	    1	NULL
+thread_id	         11	         11	statement/sql/commit          	NULL        	                  2	TRANSACTION       	    0	COMMIT
+thread_id	         12	         13	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
+
+## Combined statement and transaction event history ordered by event id
+
+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>
+thread_id	          3	          3	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (410, "INSERT 410")
+thread_id	          4	          4	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (411, "INSERT 411")
+thread_id	          5	          5	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (412, "INSERT 412")
+thread_id	          6	          6	statement/sql/delete     	                  2	TRANSACTION       	DELETE FROM t1 WHERE s1 > 410
+thread_id	          7	          7	statement/sql/select     	                  2	TRANSACTION       	SELECT * FROM t1 ORDER BY s1
+thread_id	          8	         10	statement/sql/select     	                  2	TRANSACTION       	SELECT fn_add(413, 414)
+thread_id	          9	          9	statement/sp/stmt        	                  8	STATEMENT         	INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y")
+thread_id	         10	         10	statement/sp/freturn     	                  8	STATEMENT         	NULL
+thread_id	         11	         11	statement/sql/commit     	                  2	TRANSACTION       	COMMIT
+thread_id	         12	         13	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
+thread_id	         13	         13	transaction              	                 12	STATEMENT         	<transaction started>
+
+## 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
+
+START TRANSACTION;
+SELECT fn_add(415, 416);
+fn_add(415, 416)
+831
+
+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)
+thread_id	          4	          4	statement/sp/stmt             	fn_add      	                  3	STATEMENT         	    1	INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y")
+thread_id	          5	          5	statement/sp/freturn          	fn_add      	                  3	STATEMENT         	    1	NULL
+thread_id	          6	          6	statement/sql/rollback        	NULL        	                  2	TRANSACTION       	    0	ROLLBACK
+thread_id	          7	          8	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
+
+## Combined statement and transaction event history ordered by event id
+
+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>
+thread_id	          3	          5	statement/sql/select     	                  2	TRANSACTION       	SELECT fn_add(415, 416)
+thread_id	          4	          4	statement/sp/stmt        	                  3	STATEMENT         	INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y")
+thread_id	          5	          5	statement/sp/freturn     	                  3	STATEMENT         	NULL
+thread_id	          6	          6	statement/sql/rollback   	                  2	TRANSACTION       	ROLLBACK
+thread_id	          7	          8	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
+thread_id	          8	          8	transaction              	                  7	STATEMENT         	<transaction started>
+
+## 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
+#
+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
+
+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
+
+## Expect stored function does not exist
+
+START TRANSACTION;
+DELETE FROM t1 WHERE s1 > 320;
+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
+
+## Clear transaction and statement tables
+CALL test.clear_history();
+#========================================================================
+# STEP 5 - TRANSACTIONS AND TRIGGERS
+#========================================================================
+
+#
+# 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
+FOR EACH ROW
+BEGIN
+IF OLD.s1 >= 505 THEN
+SIGNAL sqlstate '45001' SET message_text = "FORCE ERROR";
+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.
+
+START TRANSACTION;
+INSERT INTO t1 VALUES (500, "INSERT 500");
+INSERT INTO t1 VALUES (501, "INSERT 501");
+INSERT INTO t1 VALUES (502, "INSERT 502");
+INSERT INTO t1 VALUES (503, "INSERT 503");
+INSERT INTO t1 VALUES (504, "INSERT 504");
+INSERT INTO t1 VALUES (505, "INSERT 505");
+
+SELECT * FROM t1 ORDER BY s1;
+s1	s2
+500	INSERT 500
+501	INSERT 501
+502	INSERT 502
+503	INSERT 503
+504	INSERT 504
+505	INSERT 505
+
+## Expect error when UPDATE hits record 505
+
+UPDATE t1 SET s1 = s1 * 2 WHERE s1 >= 500;
+ERROR 45001: FORCE ERROR
+
+## Verify that INSERT succeeded, UPDATE failed and transaction did not rollback
+
+SELECT * FROM t1 ORDER BY s1;
+s1	s2
+500	INSERT 500
+501	INSERT 501
+502	INSERT 502
+503	INSERT 503
+504	INSERT 504
+505	INSERT 505
+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")
+thread_id	          4	          4	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (501, "INSERT 501")
+thread_id	          5	          5	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (502, "INSERT 502")
+thread_id	          6	          6	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (503, "INSERT 503")
+thread_id	          7	          7	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (504, "INSERT 504")
+thread_id	          8	          8	statement/sql/insert          	NULL        	                  2	TRANSACTION       	    0	INSERT INTO t1 VALUES (505, "INSERT 505")
+thread_id	          9	          9	statement/sql/select          	NULL        	                  2	TRANSACTION       	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	         10	         17	statement/sql/update          	NULL        	                  2	TRANSACTION       	    0	UPDATE t1 SET s1 = s1 * 2 WHERE s1 >= 500
+thread_id	         11	         11	statement/sp/jump_if_not      	trigger_befo	                 10	STATEMENT         	    1	NULL
+thread_id	         12	         12	statement/sp/jump_if_not      	trigger_befo	                 10	STATEMENT         	    1	NULL
+thread_id	         13	         13	statement/sp/jump_if_not      	trigger_befo	                 10	STATEMENT         	    1	NULL
+thread_id	         14	         14	statement/sp/jump_if_not      	trigger_befo	                 10	STATEMENT         	    1	NULL
+thread_id	         15	         15	statement/sp/jump_if_not      	trigger_befo	                 10	STATEMENT         	    1	NULL
+thread_id	         16	         16	statement/sp/jump_if_not      	trigger_befo	                 10	STATEMENT         	    1	NULL
+thread_id	         17	         17	statement/sp/stmt             	trigger_befo	                 10	STATEMENT         	    1	SIGNAL sqlstate '45001' SET message_text = "FORCE ERROR"
+thread_id	         18	         18	statement/sql/select          	NULL        	                  2	TRANSACTION       	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	         19	         19	statement/sql/commit          	NULL        	                  2	TRANSACTION       	    0	COMMIT
+thread_id	         20	         21	statement/sql/drop_trigger    	NULL        	               NULL	NULL              	    0	DROP TRIGGER trigger_before_update
+
+## Combined statement and transaction event history ordered by event id
+
+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>
+thread_id	          3	          3	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (500, "INSERT 500")
+thread_id	          4	          4	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (501, "INSERT 501")
+thread_id	          5	          5	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (502, "INSERT 502")
+thread_id	          6	          6	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (503, "INSERT 503")
+thread_id	          7	          7	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (504, "INSERT 504")
+thread_id	          8	          8	statement/sql/insert     	                  2	TRANSACTION       	INSERT INTO t1 VALUES (505, "INSERT 505")
+thread_id	          9	          9	statement/sql/select     	                  2	TRANSACTION       	SELECT * FROM t1 ORDER BY s1
+thread_id	         10	         17	statement/sql/update     	                  2	TRANSACTION       	UPDATE t1 SET s1 = s1 * 2 WHERE s1 >= 500
+thread_id	         11	         11	statement/sp/jump_if_not 	                 10	STATEMENT         	NULL
+thread_id	         12	         12	statement/sp/jump_if_not 	                 10	STATEMENT         	NULL
+thread_id	         13	         13	statement/sp/jump_if_not 	                 10	STATEMENT         	NULL
+thread_id	         14	         14	statement/sp/jump_if_not 	                 10	STATEMENT         	NULL
+thread_id	         15	         15	statement/sp/jump_if_not 	                 10	STATEMENT         	NULL
+thread_id	         16	         16	statement/sp/jump_if_not 	                 10	STATEMENT         	NULL
+thread_id	         17	         17	statement/sp/stmt        	                 10	STATEMENT         	SIGNAL sqlstate '45001' SET message_text = "FORCE ERROR"
+thread_id	         18	         18	statement/sql/select     	                  2	TRANSACTION       	SELECT * FROM t1 ORDER BY s1
+thread_id	         19	         19	statement/sql/commit     	                  2	TRANSACTION       	COMMIT
+thread_id	         20	         21	statement/sql/drop_trigge	               NULL	NULL              	DROP TRIGGER trigger_before_update
+thread_id	         21	         21	transaction              	                 20	STATEMENT         	<transaction started>
+
+## Clear statement and transaction history
+CALL test.clear_history();
+CALL test.clear_history();
+## Reset db.t1
+DELETE FROM db.t1;
+
+# TODO: Detect statement events from scheduled event
+#=======================================================================
+# 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;
+DROP PROCEDURE clear_transaction_history;
+DROP PROCEDURE clear_statement_history;
+DROP PROCEDURE clear_history;
+DROP PROCEDURE transaction_verifier;
diff --git a/mysql-test/suite/perfschema/r/trigger_table_io.result b/mysql-test/suite/perfschema/r/trigger_table_io.result
index 9fc63e69675..02821a481af 100644
--- a/mysql-test/suite/perfschema/r/trigger_table_io.result
+++ b/mysql-test/suite/perfschema/r/trigger_table_io.result
@@ -83,108 +83,110 @@ 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
-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
-show status where Variable_name like 'performance_schema_%' and
-Variable_name not like 'performance_schema_%_classes_lost';
+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_%';
 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
 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
new file mode 100644
index 00000000000..82a8e7ec096
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/user_var_func.result
@@ -0,0 +1,91 @@
+set @v1a="Hello";
+set @v2a="World";
+set @v3a=65;
+set @v4a=NULL;
+select @v1a, @v2a, @v3a, @v4a, @v_unknown;
+@v1a	@v2a	@v3a	@v4a	@v_unknown
+Hello	World	65	NULL	NULL
+select VARIABLE_NAME, VARIABLE_VALUE
+from performance_schema.user_variables_by_thread
+order by VARIABLE_NAME;
+VARIABLE_NAME	VARIABLE_VALUE
+v1a	Hello
+v2a	World
+v3a	65
+v4a	NULL
+connect con1, localhost, root,,;
+set @v1b="Salut";
+set @v2b="La compagnie";
+set @v3b=12;
+set @v4b=NULL;
+select @v1b, @v2b, @v3b, @v4b, @v_unknown;
+@v1b	@v2b	@v3b	@v4b	@v_unknown
+Salut	La compagnie	12	NULL	NULL
+select VARIABLE_NAME, VARIABLE_VALUE
+from performance_schema.user_variables_by_thread
+order by VARIABLE_NAME;
+VARIABLE_NAME	VARIABLE_VALUE
+v1a	Hello
+v1b	Salut
+v2a	World
+v2b	La compagnie
+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;
+VARIABLE_NAME	VARIABLE_VALUE
+v1a	Hello
+v2a	World
+v3a	65
+v4a	NULL
+set @blob_under_16_bits=repeat("a", 65000);
+set @blob_under_24_bits=repeat("a", 1000000);
+select length(@blob_under_16_bits);
+length(@blob_under_16_bits)
+65000
+select length(@blob_under_24_bits);
+length(@blob_under_24_bits)
+1000000
+select variable_name, length(variable_value)
+from performance_schema.user_variables_by_thread
+where VARIABLE_NAME like "blob%"
+  order by VARIABLE_NAME;
+variable_name	length(variable_value)
+blob_under_16_bits	65000
+blob_under_24_bits	1000000
+set @a=10;
+CREATE procedure test_user_val
+(IN input INT,OUT output INT)
+BEGIN
+SELECT input + input
+INTO output;
+END|
+CALL test_user_val(@a , @total);
+select VARIABLE_NAME,VARIABLE_VALUE from performance_schema.user_variables_by_thread 
+where variable_name in ('a','total') order by VARIABLE_NAME;
+VARIABLE_NAME	VARIABLE_VALUE
+a	10
+total	20
+create table t1 (c1 int);
+CREATE TRIGGER test_uvar_trigger
+AFTER INSERT ON t1
+FOR EACH ROW BEGIN
+set @a=@a+@a;
+END|
+insert into t1 values(1);
+select VARIABLE_NAME,VARIABLE_VALUE from performance_schema.user_variables_by_thread 
+where variable_name ='a' order by VARIABLE_NAME;
+VARIABLE_NAME	VARIABLE_VALUE
+a	20
+insert into t1 values(1);
+select VARIABLE_NAME,VARIABLE_VALUE from performance_schema.user_variables_by_thread 
+where variable_name ='a' order by VARIABLE_NAME;
+VARIABLE_NAME	VARIABLE_VALUE
+a	40
+drop table t1;
+drop procedure test_user_val;
diff --git a/mysql-test/suite/perfschema/r/view_table_io.result b/mysql-test/suite/perfschema/r/view_table_io.result
index 2f9a70cdeaa..f1591f46a41 100644
--- a/mysql-test/suite/perfschema/r/view_table_io.result
+++ b/mysql-test/suite/perfschema/r/view_table_io.result
@@ -77,65 +77,71 @@ 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
-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		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_%';
 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
 truncate performance_schema.events_waits_history_long;