687 files changed, 107563 insertions, 28552 deletions

diff --git a/mysql-test/suite/perfschema/disabled.def b/mysql-test/suite/perfschema/disabled.def
index 321cd7dcd16..9c36708729a 100644
--- a/mysql-test/suite/perfschema/disabled.def
+++ b/mysql-test/suite/perfschema/disabled.def
@@ -24,3 +24,34 @@ binlog_ok_row: needs slave_relay_log_info
 binlog_ok_stmt: needs slave_relay_log_info
 
 server_init : Nirbhay TODO: Fix the test
+show_sanity:
+threads_mysql_freebsd:
+
+transaction_gtid: needs to be updated for MariaDB gtids
+
+ddl_replication_applier_status_by_worker: todo
+ddl_replication_connection_status: todo
+dml_replication_applier_status_by_worker: todo
+dml_replication_connection_status: todo
+
+dml_replication_group_member_stats: todo?
+ddl_replication_group_member_stats: todo?
+ddl_replication_group_members: todo?
+dml_replication_group_members: todo?
+replication_group_members: todo?
+replication_group_member_stats: todo?
+rpl_group_member_stats: todo?
+rpl_group_members: todo?
+
+ddl_session_variables: todo
+ddl_global_variables: todo
+ddl_variables_by_thread: todo
+dml_global_variables: todo
+dml_session_variables: todo
+dml_variables_by_thread: todo
+variables_by_thread: todo
+show_coverage: todo
+show_misc: todo
+show_plugin: todo
+
+status_reprepare:why P_S filters out Com_* variables?
diff --git a/mysql-test/suite/perfschema/include/binlog_edge_common.inc b/mysql-test/suite/perfschema/include/binlog_edge_common.inc
index 8092c9a5427..6ecd50afe08 100644
--- a/mysql-test/suite/perfschema/include/binlog_edge_common.inc
+++ b/mysql-test/suite/perfschema/include/binlog_edge_common.inc
@@ -148,7 +148,7 @@ drop table if exists marker_multi_delete;
 use my_replicated_db;
 
 insert into performance_schema.setup_actors
-  values ('FOO', 'FOO', 'FOO');
+  values ('FOO', 'FOO', 'FOO', 'YES', 'YES');
 
 --error 0, ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES
 delete my_tx_table.*, performance_schema.setup_actors.*
@@ -157,7 +157,7 @@ delete my_tx_table.*, performance_schema.setup_actors.*
   or performance_schema.setup_actors.role='FOO';
 
 insert into performance_schema.setup_actors
-  values ('BAR', 'BAR', 'BAR');
+  values ('BAR', 'BAR', 'BAR', 'YES', 'YES');
 
 --error 0, ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES
 delete my_non_tx_table.*, performance_schema.setup_actors.*
@@ -166,7 +166,7 @@ delete my_non_tx_table.*, performance_schema.setup_actors.*
   or performance_schema.setup_actors.role='BAR';
 
 insert into performance_schema.setup_actors
-  values ('BAZ', 'BAZ', 'BAZ');
+  values ('BAZ', 'BAZ', 'BAZ', 'YES', 'YES');
 
 --error 0, ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES
 delete my_bh_table.*, performance_schema.setup_actors.*
@@ -184,5 +184,5 @@ drop database my_replicated_db;
 # Restore performance_schema.setup_actors, damaged by this script
 
 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/include/event_aggregate_cleanup.inc b/mysql-test/suite/perfschema/include/event_aggregate_cleanup.inc
index c50394f748b..2cb8a69e4d6 100644
--- a/mysql-test/suite/perfschema/include/event_aggregate_cleanup.inc
+++ b/mysql-test/suite/perfschema/include/event_aggregate_cleanup.inc
@@ -36,6 +36,12 @@ drop prepare dump_statements_host;
 drop prepare dump_statements_history;
 drop prepare dump_statements_global;
 
+drop prepare dump_transactions_account;
+drop prepare dump_transactions_user;
+drop prepare dump_transactions_host;
+drop prepare dump_transactions_history;
+drop prepare dump_transactions_global;
+
 drop prepare dump_users;
 drop prepare dump_hosts;
 drop prepare dump_accounts;
@@ -49,6 +55,7 @@ insert into performance_schema.setup_actors
   select * from test.setup_actors;
 drop table test.setup_actors;
 drop table test.t1;
+drop function test.f;
 
 update performance_schema.threads set instrumented='YES';
 update performance_schema.setup_instruments set enabled='YES', timed='YES';
diff --git a/mysql-test/suite/perfschema/include/event_aggregate_load.inc b/mysql-test/suite/perfschema/include/event_aggregate_load.inc
index 68dbde276df..b27a3113318 100644
--- a/mysql-test/suite/perfschema/include/event_aggregate_load.inc
+++ b/mysql-test/suite/perfschema/include/event_aggregate_load.inc
@@ -21,19 +21,21 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
 
 # Notes about this test
 #
-# Each connect causes 2 wait/synch/mutex/sql/LOCK_connection_count events:
-# - 1 in mysqld.cc, create_new_thread(), for the main thread
-# - 1 in sql_connect.cc, check_user(), for the connected thread
 # The main thread does not count for BY_ACCOUNT / BY_HOST.
 # The user thread does count for BY_ACCOUNT, BY_HOST
 #
-# Each get_lock() causes 1 wait/synch/mutex/sql/LOCK_user_locks
+# Each uuid_short() causes 1 wait/synch/mutex/sql/LOCK_uuid_generator
 #
 # To avoid noise from main, the background threads are disabled.
 
@@ -64,15 +66,23 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
 
 --connection con1
 
-select get_lock("marker", 10);
-select release_lock("marker");
+select uuid_short() <> 1;
+select uuid_short() <> 1;
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
 
 --connection default
 
@@ -99,6 +109,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -134,15 +149,23 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
 
 --connection con2
 
-select get_lock("marker", 10);
-select release_lock("marker");
+select uuid_short() <> 1;
+select uuid_short() <> 1;
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
 
 --connection default
 
@@ -169,6 +192,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -200,15 +228,23 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
 
 --connection con3
 
-select get_lock("marker", 10);
-select release_lock("marker");
+select uuid_short() <> 1;
+select uuid_short() <> 1;
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
 
 --connection default
 
@@ -235,6 +271,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -266,15 +307,23 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
 
 --connection con4
 
-select get_lock("marker", 10);
-select release_lock("marker");
+select uuid_short() <> 1;
+select uuid_short() <> 1;
+start transaction;
 insert into test.t1 values ("marker");
+commit;
+select test.f(10,20);
 
 --connection default
 
@@ -301,6 +350,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -332,6 +386,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -363,6 +422,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -394,6 +458,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -425,6 +494,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -452,6 +526,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -477,6 +556,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -502,6 +586,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -527,6 +616,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -552,6 +646,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -577,6 +676,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -602,6 +706,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -627,6 +736,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -652,6 +766,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -677,6 +796,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -702,6 +826,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -727,6 +856,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -752,6 +886,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -777,6 +916,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -802,6 +946,161 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+
+echo "================== TRANSACTIONS_BY_THREAD truncated ==================";
+
+echo "================== Step 29 ==================";
+call dump_thread();
+execute dump_waits_account;
+execute dump_waits_user;
+execute dump_waits_host;
+execute dump_waits_global;
+execute dump_waits_history;
+execute dump_stages_account;
+execute dump_stages_user;
+execute dump_stages_host;
+execute dump_stages_global;
+execute dump_stages_history;
+execute dump_statements_account;
+execute dump_statements_user;
+execute dump_statements_host;
+execute dump_statements_global;
+execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+
+echo "================== TRANSACTIONS_BY_ACCOUNT truncated ==================";
+
+echo "================== Step 30 ==================";
+call dump_thread();
+execute dump_waits_account;
+execute dump_waits_user;
+execute dump_waits_host;
+execute dump_waits_global;
+execute dump_waits_history;
+execute dump_stages_account;
+execute dump_stages_user;
+execute dump_stages_host;
+execute dump_stages_global;
+execute dump_stages_history;
+execute dump_statements_account;
+execute dump_statements_user;
+execute dump_statements_host;
+execute dump_statements_global;
+execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+
+echo "================== TRANSACTIONS_BY_USER truncated ==================";
+
+echo "================== Step 31 ==================";
+call dump_thread();
+execute dump_waits_account;
+execute dump_waits_user;
+execute dump_waits_host;
+execute dump_waits_global;
+execute dump_waits_history;
+execute dump_stages_account;
+execute dump_stages_user;
+execute dump_stages_host;
+execute dump_stages_global;
+execute dump_stages_history;
+execute dump_statements_account;
+execute dump_statements_user;
+execute dump_statements_host;
+execute dump_statements_global;
+execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+
+echo "================== TRANSACTIONS_BY_HOST truncated ==================";
+
+echo "================== Step 32 ==================";
+call dump_thread();
+execute dump_waits_account;
+execute dump_waits_user;
+execute dump_waits_host;
+execute dump_waits_global;
+execute dump_waits_history;
+execute dump_stages_account;
+execute dump_stages_user;
+execute dump_stages_host;
+execute dump_stages_global;
+execute dump_stages_history;
+execute dump_statements_account;
+execute dump_statements_user;
+execute dump_statements_host;
+execute dump_statements_global;
+execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+
+echo "================== TRANSACTIONS_GLOBAL truncated ==================";
+
+echo "================== Step 33 ==================";
+call dump_thread();
+execute dump_waits_account;
+execute dump_waits_user;
+execute dump_waits_host;
+execute dump_waits_global;
+execute dump_waits_history;
+execute dump_stages_account;
+execute dump_stages_user;
+execute dump_stages_host;
+execute dump_stages_global;
+execute dump_stages_history;
+execute dump_statements_account;
+execute dump_statements_user;
+execute dump_statements_host;
+execute dump_statements_global;
+execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -810,7 +1109,7 @@ truncate performance_schema.accounts;
 
 echo "================== ACCOUNTS truncated ==================";
 
-echo "================== Step 29 ==================";
+echo "================== Step 34 ==================";
 call dump_thread();
 execute dump_waits_account;
 execute dump_waits_user;
@@ -827,6 +1126,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -835,7 +1139,7 @@ truncate performance_schema.users;
 
 echo "================== USERS truncated ==================";
 
-echo "================== Step 30 ==================";
+echo "================== Step 35 ==================";
 call dump_thread();
 execute dump_waits_account;
 execute dump_waits_user;
@@ -852,6 +1156,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
@@ -860,7 +1169,7 @@ truncate performance_schema.hosts;
 
 echo "================== HOSTS truncated ==================";
 
-echo "================== Step 31 ==================";
+echo "================== Step 36 ==================";
 call dump_thread();
 execute dump_waits_account;
 execute dump_waits_user;
@@ -877,6 +1186,11 @@ execute dump_statements_user;
 execute dump_statements_host;
 execute dump_statements_global;
 execute dump_statements_history;
+execute dump_transactions_account;
+execute dump_transactions_user;
+execute dump_transactions_host;
+execute dump_transactions_global;
+execute dump_transactions_history;
 execute dump_accounts;
 execute dump_users;
 execute dump_hosts;
diff --git a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
index f116b09ff04..03f88e97eef 100644
--- a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
+++ b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
@@ -19,11 +19,16 @@
 # - events_statements_summary_by_account_by_event_name
 # - events_statements_summary_by_user_by_event_name
 # - events_statements_summary_by_host_by_event_name
+# - events_transactions_summary_by_thread_by_event_name
+# - events_transactions_summary_by_account_by_event_name
+# - events_transactions_summary_by_user_by_event_name
+# - events_transactions_summary_by_host_by_event_name
 #
 # Globally:
 # - events_waits_summary_global_by_event_name
 # - events_stages_summary_global_by_event_name
 # - events_statements_summary_global_by_event_name
+# - events_transactions_summary_global_by_event_name
 #
 # The tests are written with the following helpers:
 # - include/event_aggregate_setup.inc
@@ -90,6 +95,8 @@ drop table if exists test.t1;
 --enable_warnings
 
 create table test.t1(a varchar(64));
+create function test.f(a int, b int) returns int
+return a+b;
 
 create table test.setup_actors as
   select * from performance_schema.setup_actors;
@@ -112,14 +119,15 @@ update performance_schema.setup_instruments set enabled='NO', timed='NO';
 
 update performance_schema.setup_instruments set enabled='YES', timed='YES'
   where name in ('wait/synch/mutex/sql/LOCK_connection_count',
-                 'wait/synch/mutex/sql/LOCK_user_locks',
+                 'wait/synch/mutex/sql/LOCK_uuid_generator',
                  'wait/synch/rwlock/sql/LOCK_grant',
                  'wait/io/file/sql/query_log',
                  'idle');
 
 update performance_schema.setup_instruments set enabled='YES', timed='YES'
-  where name in ('stage/sql/Init', 'stage/sql/Init for update',
-                 'stage/sql/Checking permissions',
+  where name in ('stage/sql/starting',
+                 'stage/sql/init',
+                 'stage/sql/checking permissions',
                  'stage/sql/Opening tables',
                  'stage/sql/Closing tables');
 
@@ -129,7 +137,11 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES'
                  'statement/abstract/new_packet',
                  'statement/abstract/Query',
                  'statement/com/Quit',
-                 'statement/com/error');
+                 'statement/com/error',
+                 'statement/sp/freturn');
+
+update performance_schema.setup_instruments set enabled='YES', timed='YES'
+  where name in ('transaction');
 
 # Start from a known clean state, to avoid noise from previous tests
 flush tables;
@@ -155,6 +167,13 @@ truncate performance_schema.events_statements_summary_by_host_by_event_name;
 truncate performance_schema.events_statements_summary_global_by_event_name;
 truncate performance_schema.events_statements_history_long;
 
+truncate performance_schema.events_transactions_summary_by_thread_by_event_name;
+truncate performance_schema.events_transactions_summary_by_account_by_event_name;
+truncate performance_schema.events_transactions_summary_by_user_by_event_name;
+truncate performance_schema.events_transactions_summary_by_host_by_event_name;
+truncate performance_schema.events_transactions_summary_global_by_event_name;
+truncate performance_schema.events_transactions_history_long;
+
 --disable_warnings
 drop procedure if exists dump_thread;
 drop procedure if exists dump_one_thread;
@@ -182,7 +201,7 @@ begin
     select username, event_name, count_star
       from performance_schema.events_waits_summary_by_thread_by_event_name
       where event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
-                           'wait/synch/mutex/sql/LOCK_user_locks',
+                           'wait/synch/mutex/sql/LOCK_uuid_generator',
                            'wait/synch/rwlock/sql/LOCK_grant',
                            'wait/io/file/sql/query_log')
       and thread_id = my_thread_id
@@ -200,7 +219,7 @@ prepare dump_waits_account from
   from performance_schema.events_waits_summary_by_account_by_event_name
   where user like \'user%\'
   and event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
-                     'wait/synch/mutex/sql/LOCK_user_locks',
+                     'wait/synch/mutex/sql/LOCK_uuid_generator',
                      'wait/synch/rwlock/sql/LOCK_grant',
                      'wait/io/file/sql/query_log')
   order by user, host, event_name;";
@@ -210,7 +229,7 @@ prepare dump_waits_user from
   from performance_schema.events_waits_summary_by_user_by_event_name
   where user like \'user%\'
   and event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
-                     'wait/synch/mutex/sql/LOCK_user_locks',
+                     'wait/synch/mutex/sql/LOCK_uuid_generator',
                      'wait/synch/rwlock/sql/LOCK_grant',
                      'wait/io/file/sql/query_log')
   order by user, event_name;";
@@ -220,7 +239,7 @@ prepare dump_waits_host from
   from performance_schema.events_waits_summary_by_host_by_event_name
   where host=\'localhost\'
   and event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
-                     'wait/synch/mutex/sql/LOCK_user_locks',
+                     'wait/synch/mutex/sql/LOCK_uuid_generator',
                      'wait/synch/rwlock/sql/LOCK_grant',
                      'wait/io/file/sql/query_log')
   order by host, event_name;";
@@ -229,7 +248,7 @@ prepare dump_waits_global from
   "select event_name, count_star
   from performance_schema.events_waits_summary_global_by_event_name
   where event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
-                       'wait/synch/mutex/sql/LOCK_user_locks',
+                       'wait/synch/mutex/sql/LOCK_uuid_generator',
                        'wait/synch/rwlock/sql/LOCK_grant',
                        'wait/io/file/sql/query_log')
   order by event_name;";
@@ -238,7 +257,7 @@ prepare dump_waits_history from
   "select event_name, count(event_name)
   from performance_schema.events_waits_history_long
   where event_name in ('wait/synch/mutex/sql/LOCK_connection_count',
-                       'wait/synch/mutex/sql/LOCK_user_locks',
+                       'wait/synch/mutex/sql/LOCK_uuid_generator',
                        'wait/synch/rwlock/sql/LOCK_grant',
                        'wait/io/file/sql/query_log')
   group by event_name order by event_name;";
@@ -247,7 +266,8 @@ prepare dump_stages_account from
   "select user, host, event_name, count_star
   from performance_schema.events_stages_summary_by_account_by_event_name
   where user like \'user%\'
-  and event_name in ('stage/sql/init', 'stage/sql/Init for update',
+  and event_name in ('stage/sql/starting',
+                     'stage/sql/init',
                      'stage/sql/checking permissions',
                      'stage/sql/Opening tables',
                      'stage/sql/closing tables')
@@ -257,7 +277,8 @@ prepare dump_stages_user from
   "select user, event_name, count_star
   from performance_schema.events_stages_summary_by_user_by_event_name
   where user like \'user%\'
-  and event_name in ('stage/sql/init', 'stage/sql/Init for update',
+  and event_name in ('stage/sql/starting',
+                     'stage/sql/init',
                      'stage/sql/checking permissions',
                      'stage/sql/Opening tables',
                      'stage/sql/closing tables')
@@ -267,7 +288,8 @@ prepare dump_stages_host from
   "select host, event_name, count_star
   from performance_schema.events_stages_summary_by_host_by_event_name
   where host=\'localhost\'
-  and event_name in ('stage/sql/init', 'stage/sql/Init for update',
+  and event_name in ('stage/sql/starting',
+                     'stage/sql/init',
                      'stage/sql/checking permissions',
                      'stage/sql/Opening tables',
                      'stage/sql/closing tables')
@@ -276,7 +298,8 @@ prepare dump_stages_host from
 prepare dump_stages_global from
   "select event_name, count_star
   from performance_schema.events_stages_summary_global_by_event_name
-  where event_name in ('stage/sql/init', 'stage/sql/Init for update',
+  where event_name in ('stage/sql/starting',
+                       'stage/sql/init',
                        'stage/sql/checking permissions',
                        'stage/sql/Opening tables',
                        'stage/sql/closing tables')
@@ -285,7 +308,8 @@ prepare dump_stages_global from
 prepare dump_stages_history from
   "select event_name, count(event_name)
   from performance_schema.events_stages_history_long
-  where event_name in ('stage/sql/init', 'stage/sql/Init for update',
+  where event_name in ('stage/sql/starting',
+                       'stage/sql/init',
                        'stage/sql/checking permissions',
                        'stage/sql/Opening tables',
                        'stage/sql/closing tables')
@@ -298,7 +322,8 @@ prepare dump_statements_account from
   and event_name in ('statement/sql/select',
                      'statement/sql/insert',
                      'statement/com/Quit',
-                     'statement/com/error')
+                     'statement/com/error',
+                     'statement/sp/freturn')
   order by user, host, event_name;";
 
 prepare dump_statements_user from
@@ -308,7 +333,8 @@ prepare dump_statements_user from
   and event_name in ('statement/sql/select',
                      'statement/sql/insert',
                      'statement/com/Quit',
-                     'statement/com/error')
+                     'statement/com/error',
+                     'statement/sp/freturn')
   order by user, event_name;";
 
 prepare dump_statements_host from
@@ -318,7 +344,8 @@ prepare dump_statements_host from
   and event_name in ('statement/sql/select',
                      'statement/sql/insert',
                      'statement/com/Quit',
-                     'statement/com/error')
+                     'statement/com/error',
+                     'statement/sp/freturn')
   order by host, event_name;";
 
 prepare dump_statements_global from
@@ -327,7 +354,8 @@ prepare dump_statements_global from
   where event_name in ('statement/sql/select',
                        'statement/sql/insert',
                        'statement/com/Quit',
-                       'statement/com/error')
+                       'statement/com/error',
+                       'statement/sp/freturn')
   order by event_name;";
 
 prepare dump_statements_history from
@@ -336,7 +364,41 @@ prepare dump_statements_history from
   where event_name in ('statement/sql/select',
                        'statement/sql/insert',
                        'statement/com/Quit',
-                       'statement/com/error')
+                       'statement/com/error',
+                       'statement/sp/freturn')
+  group by event_name order by event_name;";
+
+prepare dump_transactions_account from
+  "select user, host, event_name, count_star
+  from performance_schema.events_transactions_summary_by_account_by_event_name
+  where user like \'user%\'
+  and event_name in ('transaction')
+  order by user, host, event_name;";
+
+prepare dump_transactions_user from
+  "select user, event_name, count_star
+  from performance_schema.events_transactions_summary_by_user_by_event_name
+  where user like \'user%\'
+  and event_name in ('transaction')
+  order by user, event_name;";
+
+prepare dump_transactions_host from
+  "select host, event_name, count_star
+  from performance_schema.events_transactions_summary_by_host_by_event_name
+  where host=\'localhost\'
+  and event_name in ('transaction')
+  order by host, event_name;";
+
+prepare dump_transactions_global from
+  "select event_name, count_star
+  from performance_schema.events_transactions_summary_global_by_event_name
+  where event_name in ('transaction')
+  order by event_name;";
+
+prepare dump_transactions_history from
+  "select event_name, count(event_name)
+  from performance_schema.events_transactions_history_long
+  where event_name in ('transaction')
   group by event_name order by event_name;";
 
 prepare dump_users from
diff --git a/mysql-test/suite/perfschema/include/hostcache_dump.inc b/mysql-test/suite/perfschema/include/hostcache_dump.inc
index 7f456a0c499..1d595ba24c0 100644
--- a/mysql-test/suite/perfschema/include/hostcache_dump.inc
+++ b/mysql-test/suite/perfschema/include/hostcache_dump.inc
@@ -1,6 +1,6 @@
 # Helper for hostcache_*.test
 
---echo "Dumping performance_schema.host_cache"
+--echo # Dumping performance_schema.host_cache
 
 --disable_query_log
 --vertical_results
diff --git a/mysql-test/suite/perfschema/include/memory_aggregate_cleanup.inc b/mysql-test/suite/perfschema/include/memory_aggregate_cleanup.inc
new file mode 100644
index 00000000000..1e2cfa99e5c
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/memory_aggregate_cleanup.inc
@@ -0,0 +1,45 @@
+# Tests for the performance schema
+
+# ===========================================
+# HELPER include/memory_aggregate_cleanup.inc
+# ===========================================
+
+--disable_query_log
+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;
+
+drop procedure dump_thread;
+drop procedure dump_one_thread;
+
+drop prepare dump_memory_account;
+drop prepare dump_memory_user;
+drop prepare dump_memory_host;
+drop prepare dump_memory_global;
+
+drop prepare dump_users;
+drop prepare dump_hosts;
+drop prepare dump_accounts;
+
+truncate table performance_schema.accounts;
+truncate table performance_schema.users;
+truncate table performance_schema.hosts;
+
+truncate table performance_schema.setup_actors;
+insert into performance_schema.setup_actors
+  select * from test.setup_actors;
+drop table test.setup_actors;
+
+set global query_cache_size=0;
+
+update performance_schema.threads set instrumented='YES';
+update performance_schema.setup_instruments set enabled='YES', timed='YES';
+
+--enable_query_log
+
diff --git a/mysql-test/suite/perfschema/include/memory_aggregate_load.inc b/mysql-test/suite/perfschema/include/memory_aggregate_load.inc
new file mode 100644
index 00000000000..7a54d25216e
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/memory_aggregate_load.inc
@@ -0,0 +1,506 @@
+# Tests for the performance schema
+
+# ========================================
+# HELPER include/memory_aggregate_load.inc
+# ========================================
+
+echo "================== Step 1 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+# Notes about this test
+#
+# get_lock("marker") causes the following memory allocation:
+# memory/sql/User_level_lock, 1 malloc, size 16 (size 8 for 32-bit systems).
+# release_lock("marker") causes the following memory free:
+# memory/sql/User_level_lock, 1 free, size 16 (size 8 for 32-bit systems).
+#
+# To avoid noise from main, the background threads are disabled.
+
+connect (con1, localhost, user1, , );
+
+echo "================== con1 connected ==================";
+
+--connection default
+
+# Wait for the connect to complete
+let $wait_condition=
+  select count(*) = 1 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user1';
+--source include/wait_condition.inc
+
+echo "================== Step 2 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+--connection con1
+
+set GLOBAL query_cache_size=1000*1024;
+select get_lock("marker_1", 10);
+select release_lock("marker_1");
+set @v1 = repeat("a", 1000);
+set @v2 = repeat("b", 2000);
+set @v3 = repeat("c", 4000);
+
+echo "================== con1 marker ==================";
+
+--connection default
+
+# Wait for the payload to complete
+let $wait_condition=
+  select count(*) = 1 from performance_schema.events_waits_current
+  where EVENT_NAME= 'idle';
+--source include/wait_condition.inc
+
+echo "================== Step 3 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+# Debugging helpers
+# select * from performance_schema.events_waits_history_long;
+# select PROCESSLIST_USER, PROCESSLIST_HOST, INSTRUMENTED from performance_schema.threads;
+
+connect (con2, localhost, user2, , );
+
+echo "================== con2 connected ==================";
+
+--connection default
+
+# Wait for the connect to complete
+let $wait_condition=
+  select count(*) = 1 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user2';
+--source include/wait_condition.inc
+
+echo "================== Step 4 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+--connection con2
+
+set GLOBAL query_cache_size=2000*1024;
+select get_lock("marker_2", 10);
+select release_lock("marker_2");
+set @v1 = repeat("a", 1000);
+set @v2 = repeat("b", 2000);
+set @v3 = repeat("c", 4000);
+
+echo "================== con2 marker ==================";
+
+--connection default
+
+# Wait for the payload to complete
+let $wait_condition=
+  select count(*) = 2 from performance_schema.events_waits_current
+  where EVENT_NAME= 'idle';
+--source include/wait_condition.inc
+
+echo "================== Step 5 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+
+echo "================== MEMORY_BY_THREAD truncated ==================";
+
+echo "================== Step 5b ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+connect (con3, localhost, user3, , );
+
+echo "================== con3 connected ==================";
+
+--connection default
+
+# Wait for the connect to complete
+let $wait_condition=
+  select count(*) = 1 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user3';
+--source include/wait_condition.inc
+
+echo "================== Step 6 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+--connection con3
+
+set GLOBAL query_cache_size=500*1024;
+select get_lock("marker_3", 10);
+select release_lock("marker_3");
+set @v1 = repeat("a", 1000);
+set @v2 = repeat("b", 2000);
+set @v3 = repeat("c", 4000);
+
+echo "================== con3 marker ==================";
+
+--connection default
+
+# Wait for the payload to complete
+let $wait_condition=
+  select count(*) = 3 from performance_schema.events_waits_current
+  where EVENT_NAME= 'idle';
+--source include/wait_condition.inc
+
+echo "================== Step 7 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+connect (con4, localhost, user4, , );
+connect (con5, localhost, user4, , );
+
+echo "================== con4/con5 (both user4) connected ==================";
+
+--connection default
+
+# Wait for the connects to complete
+let $wait_condition=
+  select count(*) = 2 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user4';
+--source include/wait_condition.inc
+
+echo "================== Step 8 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+--connection con4
+
+set GLOBAL query_cache_size=4000*1024;
+select get_lock("marker_4", 10);
+select release_lock("marker_4");
+set @v1 = repeat("a", 1000);
+set @v2 = repeat("b", 2000);
+set @v3 = repeat("c", 4000);
+
+--connection con5
+select get_lock("marker_5", 10);
+select release_lock("marker_5");
+set @v1 = repeat("a", 1000);
+set @v2 = repeat("b", 2000);
+set @v3 = repeat("c", 4000);
+
+echo "================== con4/con5 marker ==================";
+
+--connection default
+
+# Wait for the payload to complete
+let $wait_condition=
+  select count(*) = 5 from performance_schema.events_waits_current
+  where EVENT_NAME= 'idle';
+--source include/wait_condition.inc
+
+echo "================== Step 9 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+--disconnect con1
+--disconnect con5
+
+--connection default
+
+# Wait for the disconnects to complete
+let $wait_condition=
+  select count(*) = 0 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user1';
+--source include/wait_condition.inc
+let $wait_condition=
+  select count(*) = 1 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user4';
+--source include/wait_condition.inc
+
+echo "================== con1/con5 disconnected ==================";
+
+echo "================== Step 10 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+--disconnect con2
+
+--connection default
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 0 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user2';
+--source include/wait_condition.inc
+
+echo "================== con2 disconnected ==================";
+
+echo "================== Step 11 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+--disconnect con3
+
+--connection default
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 0 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user3';
+--source include/wait_condition.inc
+
+echo "================== con3 disconnected ==================";
+
+echo "================== Step 12 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+--disconnect con4
+
+--connection default
+
+# Wait for the disconnect to complete
+let $wait_condition=
+  select count(*) = 0 from performance_schema.threads
+  where `TYPE`='FOREGROUND' and PROCESSLIST_USER= 'user4';
+--source include/wait_condition.inc
+
+echo "================== con4 disconnected ==================";
+
+echo "================== Step 13 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+--connection default
+
+truncate performance_schema.memory_summary_by_thread_by_event_name;
+
+echo "================== MEMORY_BY_THREAD truncated ==================";
+
+echo "================== Step 14 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.memory_summary_by_account_by_event_name;
+
+echo "================== MEMORY_BY_ACCOUNT truncated ==================";
+
+echo "================== Step 15 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.memory_summary_by_user_by_event_name;
+
+echo "================== MEMORY_BY_USER truncated ==================";
+
+echo "================== Step 16 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.memory_summary_by_host_by_event_name;
+
+echo "================== MEMORY_BY_HOST truncated ==================";
+
+echo "================== Step 17 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.memory_summary_global_by_event_name;
+
+echo "================== MEMORY_GLOBAL truncated ==================";
+
+echo "================== Step 18 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.accounts;
+
+echo "================== ACCOUNTS truncated ==================";
+
+echo "================== Step 19 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.users;
+
+echo "================== USERS truncated ==================";
+
+echo "================== Step 20 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
+truncate performance_schema.hosts;
+
+echo "================== HOSTS truncated ==================";
+
+echo "================== Step 21 ==================";
+--vertical_results
+call dump_thread();
+execute dump_memory_account;
+execute dump_memory_user;
+execute dump_memory_host;
+execute dump_memory_global;
+--horizontal_results
+execute dump_accounts;
+execute dump_users;
+execute dump_hosts;
+
diff --git a/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc b/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc
new file mode 100644
index 00000000000..1272c0921e7
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/memory_aggregate_setup.inc
@@ -0,0 +1,208 @@
+# Tests for the performance schema
+
+# =============
+# DOCUMENTATION
+# =============
+
+# Verify how memory stats are aggregated into various tables
+#
+# In the thread dimension:
+# - memory_summary_by_thread_by_event_name
+# - memory_summary_by_account_by_event_name
+# - memory_summary_by_user_by_event_name
+# - memory_summary_by_host_by_event_name
+#
+# Globally:
+# - memory_summary_global_by_event_name
+#
+# The tests are written with the following helpers:
+# - include/memory_aggregate_setup.inc
+# - include/memory_aggregate_load.inc
+# - include/memory_aggregate_cleanup.inc
+#
+# Helpers are intended to be used as follows.
+#
+# A Typical test t/memory_aggregate_xxx.test will consist of:
+# --source ../include/memory_aggregate_setup.inc
+# --source ../include/memory_aggregate_load.inc
+# --source ../include/memory_aggregate_cleanup.inc
+# and a t/memory_aggregate_xxx-master.opt file
+#
+# Naming conventions for t/memory_aggregate_xxx.test are as follows:
+# t/memory_aggregate_<account><user><host>
+#
+# <account> corresponds to different sizing settings for 
+# the variable performance-schema-accounts-size
+# - (blank): accounts-size sufficient to represent all records
+# - no_a: accounts-size set to 0
+#
+# <user> corresponds to different sizing settings for 
+# the variable performance-schema-users-size
+# - (blank): users-size sufficient to represent all records
+# - no_u: users-size set to 0
+#
+# <host> corresponds to different sizing settings for 
+# the variable performance-schema-hosts-size
+# - (blank): hosts-size sufficient to represent all records
+# - no_h: hosts-size set to 0
+
+# =========================================
+# HELPER include/memory_aggregate_setup.inc
+# =========================================
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+--source ../include/wait_for_pfs_thread_count.inc
+--source include/not_windows.inc
+
+--disable_query_log
+
+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;
+grant ALL on *.* to user4@localhost;
+set sql_mode= @orig_sql_mode;
+
+flush privileges;
+
+# Purge old users, hosts, user/host from previous tests
+truncate table performance_schema.accounts;
+truncate table performance_schema.users;
+truncate table performance_schema.hosts;
+
+# Save the setup
+
+--disable_warnings
+drop table if exists test.setup_actors;
+--enable_warnings
+
+create table test.setup_actors as
+  select * from performance_schema.setup_actors;
+
+# Only instrument the user connections
+truncate table performance_schema.setup_actors;
+insert into performance_schema.setup_actors
+  set host= 'localhost', user= 'user1', role= '%';
+insert into performance_schema.setup_actors
+  set host= 'localhost', user= 'user2', role= '%';
+insert into performance_schema.setup_actors
+  set host= 'localhost', user= 'user3', role= '%';
+insert into performance_schema.setup_actors
+  set host= 'localhost', user= 'user4', role= '%';
+
+update performance_schema.threads set instrumented='NO';
+
+# Only instrument a few events of each kind
+update performance_schema.setup_instruments set enabled='NO', timed='NO';
+
+update performance_schema.setup_instruments set enabled='YES', timed='YES'
+  where name in ('memory/sql/user_var_entry::value',
+                 'memory/sql/User_level_lock',
+                 'memory/sql/Query_cache',
+                 'idle');
+
+# Start from a known clean state, to avoid noise from previous tests
+flush tables;
+flush status;
+truncate performance_schema.memory_summary_by_thread_by_event_name;
+truncate performance_schema.memory_summary_by_account_by_event_name;
+truncate performance_schema.memory_summary_by_user_by_event_name;
+truncate performance_schema.memory_summary_by_host_by_event_name;
+truncate performance_schema.memory_summary_global_by_event_name;
+
+--disable_warnings
+drop procedure if exists dump_thread;
+drop procedure if exists dump_one_thread;
+--enable_warnings
+
+delimiter $$;
+
+create procedure dump_thread()
+begin
+  call dump_one_thread('user1');
+  call dump_one_thread('user2');
+  call dump_one_thread('user3');
+  call dump_one_thread('user4');
+end
+$$
+
+create procedure dump_one_thread(in username varchar(64))
+begin
+  declare my_thread_id int;
+
+  set my_thread_id = (select thread_id from performance_schema.threads
+                        where processlist_user=username LIMIT 1);
+
+  if (my_thread_id is not null) then
+    select username,
+      EVENT_NAME, COUNT_ALLOC, COUNT_FREE,
+      SUM_NUMBER_OF_BYTES_ALLOC, SUM_NUMBER_OF_BYTES_FREE,
+      LOW_COUNT_USED, CURRENT_COUNT_USED, HIGH_COUNT_USED,
+      LOW_NUMBER_OF_BYTES_USED, CURRENT_NUMBER_OF_BYTES_USED, HIGH_NUMBER_OF_BYTES_USED
+      from performance_schema.memory_summary_by_thread_by_event_name
+      where event_name in ('memory/sql/user_var_entry::value',
+                           'memory/sql/User_level_lock',
+                           'memory/sql/Query_cache')
+      and thread_id = my_thread_id
+      order by event_name;
+  else
+    select username, "not found" as status;
+  end if;
+end
+$$
+
+delimiter ;$$
+
+prepare dump_memory_account from
+  "select *
+  from performance_schema.memory_summary_by_account_by_event_name
+  where user like \'user%\'
+  and event_name in ('memory/sql/user_var_entry::value',
+                     'memory/sql/User_level_lock',
+                     'memory/sql/Query_cache')
+  order by user, host, event_name;";
+
+prepare dump_memory_user from
+  "select *
+  from performance_schema.memory_summary_by_user_by_event_name
+  where user like \'user%\'
+  and event_name in ('memory/sql/user_var_entry::value',
+                     'memory/sql/User_level_lock',
+                     'memory/sql/Query_cache')
+  order by user, event_name;";
+
+prepare dump_memory_host from
+  "select *
+  from performance_schema.memory_summary_by_host_by_event_name
+  where host=\'localhost\'
+  and event_name in ('memory/sql/user_var_entry::value',
+                     'memory/sql/User_level_lock',
+                     'memory/sql/Query_cache')
+  order by host, event_name;";
+
+prepare dump_memory_global from
+  "select *
+  from performance_schema.memory_summary_global_by_event_name
+  where event_name in ('memory/sql/user_var_entry::value',
+                       'memory/sql/User_level_lock',
+                       'memory/sql/Query_cache')
+  order by event_name;";
+
+prepare dump_users from
+  "select * from performance_schema.users where user is not null order by user;";
+
+prepare dump_hosts from
+  "select * from performance_schema.hosts where host is not null order by host;";
+
+prepare dump_accounts from
+  "select * from performance_schema.accounts where (user is not null) and (host is not null) order by user, host;";
+
+--enable_query_log
+
+# Make sure all the instrumentation is present
+show global status like "performance_schema_memory_classes_lost";
+
+
diff --git a/mysql-test/suite/perfschema/include/pfs_upgrade.inc b/mysql-test/suite/perfschema/include/pfs_upgrade.inc
index 0d4a864940c..8d9dca0a500 100644
--- a/mysql-test/suite/perfschema/include/pfs_upgrade.inc
+++ b/mysql-test/suite/perfschema/include/pfs_upgrade.inc
@@ -20,7 +20,7 @@ drop event if exists test.user_event;
 --enable_warnings
 
 
---echo "Testing mysql_upgrade with TABLE performance_schema.user_table"
+--echo # Testing mysql_upgrade with TABLE performance_schema.user_table
 
 create table test.user_table(a int);
 
@@ -43,7 +43,7 @@ use test;
 drop table test.user_table;
 
 
---echo "Testing mysql_upgrade with VIEW performance_schema.user_view"
+--echo # Testing mysql_upgrade with VIEW performance_schema.user_view
 
 create view test.user_view as select "Not supposed to be here";
 
@@ -66,7 +66,7 @@ use test;
 drop view test.user_view;
 
 
---echo "Testing mysql_upgrade with PROCEDURE performance_schema.user_proc"
+--echo # Testing mysql_upgrade with PROCEDURE performance_schema.user_proc
 
 create procedure test.user_proc()
   select "Not supposed to be here";
@@ -81,7 +81,7 @@ update mysql.proc set db='test' where name='user_proc';
 drop procedure test.user_proc;
 
 
---echo "Testing mysql_upgrade with FUNCTION performance_schema.user_func"
+--echo # Testing mysql_upgrade with FUNCTION performance_schema.user_func
 
 create function test.user_func() returns integer
   return 0;
@@ -96,7 +96,7 @@ update mysql.proc set db='test' where name='user_func';
 drop function test.user_func;
 
 
---echo "Testing mysql_upgrade with EVENT performance_schema.user_event"
+--echo # Testing mysql_upgrade with EVENT performance_schema.user_event
 
 create event test.user_event on schedule every 1 day do
   select "not supposed to be here";
diff --git a/mysql-test/suite/perfschema/include/prepared_stmts_deallocation.inc b/mysql-test/suite/perfschema/include/prepared_stmts_deallocation.inc
new file mode 100644
index 00000000000..1601c027984
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/prepared_stmts_deallocation.inc
@@ -0,0 +1,11 @@
+# 
+# Deallocates all the prepared statements 
+# created in prepares_stmts_setup.inc
+#
+
+DEALLOCATE PREPARE st1;
+DEALLOCATE PREPARE st2;
+DEALLOCATE PREPARE st3;
+DEALLOCATE PREPARE st4;
+
+DROP TABLE t1; 
diff --git a/mysql-test/suite/perfschema/include/prepared_stmts_execution.inc b/mysql-test/suite/perfschema/include/prepared_stmts_execution.inc
new file mode 100644
index 00000000000..dbb0696f67c
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/prepared_stmts_execution.inc
@@ -0,0 +1,18 @@
+# 
+# Execution of all the prepared statements created in 
+# prepared_statements_setup.inc.
+# 
+
+SET @a = 3;
+SET @b = 4;
+EXECUTE st1 USING @a, @b;
+
+#SET @table = 't1';
+EXECUTE st2;
+
+SET @c=3;
+EXECUTE st3 using @c;
+
+EXECUTE st4;
+
+
diff --git a/mysql-test/suite/perfschema/include/prepared_stmts_setup.inc b/mysql-test/suite/perfschema/include/prepared_stmts_setup.inc
new file mode 100644
index 00000000000..0fb14a36698
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/prepared_stmts_setup.inc
@@ -0,0 +1,20 @@
+#
+# Creating various prepared statements. 
+# HELPER include/prepared_stmts_setup.inc 
+#
+
+CREATE TABLE t1 (a INT NOT NULL);
+INSERT INTO t1 VALUES (4), (8), (11), (32), (80);
+
+# Prepared statments
+
+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';
diff --git a/mysql-test/suite/perfschema/include/program_cleanup.inc b/mysql-test/suite/perfschema/include/program_cleanup.inc
new file mode 100644
index 00000000000..ffcedccd937
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/program_cleanup.inc
@@ -0,0 +1,31 @@
+#
+# clean up of set-up created in 
+# suite/perfschema/include/program_setup.inc
+#
+
+--disable_warnings
+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;
+--enable_warnings
diff --git a/mysql-test/suite/perfschema/include/program_execution.inc b/mysql-test/suite/perfschema/include/program_execution.inc
new file mode 100644
index 00000000000..8c0bc691898
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/program_execution.inc
@@ -0,0 +1,54 @@
+#
+# Execute the stored programs created in 
+# suite/perfschema/include/program_setup.inc 
+#
+
+--echo #####################
+--echo # Executing queries #
+--echo #####################
+INSERT INTO t1 VALUES (10,20);
+CALL SampleProc1(30,40,50);
+SET @a=1;
+SELECT @a;
+CALL SampleProc2("Jwalamukhi",34);
+SELECT @a;
+CALL SampleProc3();
+CALL SampleProc4();
+SET @change=1;
+SELECT @change;
+UPDATE t2 SET id=22 WHERE name="Jwalamukhi";
+SELECT @change;
+SET @del=1;
+SELECT @del;
+DELETE FROM t1 WHERE i=76;
+SELECT @del;
+SELECT wt_avg(1, 12, 1990, 1121990);
+SELECT fac(5);
+SELECT append("Bolly", "wood");
+
+--echo # Event
+
+SET GLOBAL event_scheduler=ON;
+
+CREATE TABLE table_t(a INT);
+DELIMITER |;
+CREATE EVENT e1 ON SCHEDULE EVERY 2 SECOND DO
+BEGIN
+  INSERT INTO table_t VALUES(1);
+END|
+DELIMITER ;|
+
+# Let e1 insert 1 record into the table table_t
+
+--let $wait_condition= select count(*) = 1 from table_t
+--source include/wait_condition.inc
+SELECT * FROM table_t;
+
+# Wait till the  above one execution of event is instrumented.
+
+--let $wait_condition= select count(*) = 1 from performance_schema.events_statements_history_long where object_type='EVENT' 
+--source include/wait_condition.inc 
+
+SET GLOBAL event_scheduler=OFF;
+--source include/no_running_event_scheduler.inc
+
diff --git a/mysql-test/suite/perfschema/include/program_nested_cleanup.inc b/mysql-test/suite/perfschema/include/program_nested_cleanup.inc
new file mode 100644
index 00000000000..0f5b26f3d1b
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/program_nested_cleanup.inc
@@ -0,0 +1,21 @@
+#
+# clean up if set-up created in
+# suite/perfschema/include/program_nested_setup.inc
+#
+
+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/include/program_nested_execution.inc b/mysql-test/suite/perfschema/include/program_nested_execution.inc
new file mode 100644
index 00000000000..dbf0eafe123
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/program_nested_execution.inc
@@ -0,0 +1,22 @@
+#
+# Execute the nested stored programs created in
+# suite/include/perfschema/program_nested_setup.inc 
+#
+
+--echo #####################
+--echo # Executing queries #
+--echo #####################
+
+CALL c1(42);
+SELECT * FROM t1;
+DELETE FROM t1;
+
+CALL iotest("io1", "io2", 1);
+SELECT * FROM t1 ORDER BY data DESC;
+DELETE FROM t1;
+
+SELECT fun(6,10);
+
+INSERT INTO t1 VALUES (20,13);
+
+SELECT * FROM t2;
diff --git a/mysql-test/suite/perfschema/include/program_nested_setup.inc b/mysql-test/suite/perfschema/include/program_nested_setup.inc
new file mode 100644
index 00000000000..1f96fa28f93
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/program_nested_setup.inc
@@ -0,0 +1,88 @@
+#
+# SET-UP - Creation of various nested stored programs
+#
+
+--source include/no_protocol.inc
+--source include/have_innodb.inc
+
+--echo # 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;
+
+--echo ############################
+--echo # Creating Stored Programs #
+--echo ############################
+DELIMITER |;
+
+# Nested Stored Procedure - 1
+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)|
+
+# Nested Stored Procedure - 2
+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|
+
+# Nested Stored Function 
+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))|
+#
+# A nested stored program 
+#
+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)|
+
+DELIMITER ;|
+
diff --git a/mysql-test/suite/perfschema/include/program_setup.inc b/mysql-test/suite/perfschema/include/program_setup.inc
new file mode 100644
index 00000000000..a4e7f2451b6
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/program_setup.inc
@@ -0,0 +1,136 @@
+#
+# SET-UP - Creation of various non-nested stored programs 
+#
+
+--source include/no_protocol.inc
+--source include/have_innodb.inc
+
+--echo # 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`)
+);
+
+
+--echo ############################
+--echo # Creating Stored Programs #
+--echo ############################
+
+--echo # Stored Routine ( Procedure & Function )
+
+DELIMITER |;
+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|
+
+--echo # Triggers
+
+# INSERT 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|
+
+# UPDATE trigger
+CREATE TRIGGER trg3 AFTER UPDATE ON t2 FOR EACH ROW
+  SET @change:= @change + new.id - old.id|
+
+# DELETE triggers
+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|
+
+DELIMITER ;|
diff --git a/mysql-test/suite/perfschema/include/reset_transaction_gtid.inc b/mysql-test/suite/perfschema/include/reset_transaction_gtid.inc
new file mode 100644
index 00000000000..c8eaf53afe9
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/reset_transaction_gtid.inc
@@ -0,0 +1,20 @@
+# ==== Purpose ====
+#
+# Auxiliary file used by transaction_gtid.test
+#
+# Invoked between transactions in order to reset the state:
+# - set GTID_NEXT to AUTOMATIC since this is required after
+#   any transaction that has GTID_NEXT=UUID:NUMBER
+# - RESET MASTER in order to clear @@global.gtid_executed, so
+#   that the same GTID can be executed again.
+# - truncate the performance_schema.events_transaction_* tables
+#
+# All this is done on the connection 'server_1'.
+
+--disable_query_log
+--connection server_1
+RESET MASTER;
+TRUNCATE TABLE performance_schema.events_transactions_history;
+TRUNCATE TABLE performance_schema.events_transactions_current;
+--enable_query_log
+--connection default
diff --git a/mysql-test/suite/perfschema/include/schema.inc b/mysql-test/suite/perfschema/include/schema.inc
index f5f23893d37..8a8be180e47 100644
--- a/mysql-test/suite/perfschema/include/schema.inc
+++ b/mysql-test/suite/perfschema/include/schema.inc
@@ -27,6 +27,14 @@ show create table events_statements_summary_by_thread_by_event_name;
 show create table events_statements_summary_by_user_by_event_name;
 show create table events_statements_summary_by_account_by_event_name;
 show create table events_statements_summary_global_by_event_name;
+show create table events_transactions_current;
+show create table events_transactions_history;
+show create table events_transactions_history_long;
+show create table events_transactions_summary_by_host_by_event_name;
+show create table events_transactions_summary_by_thread_by_event_name;
+show create table events_transactions_summary_by_user_by_event_name;
+show create table events_transactions_summary_by_account_by_event_name;
+show create table events_transactions_summary_global_by_event_name;
 show create table events_waits_current;
 show create table events_waits_history;
 show create table events_waits_history_long;
@@ -36,6 +44,12 @@ show create table events_waits_summary_by_thread_by_event_name;
 show create table events_waits_summary_by_user_by_event_name;
 show create table events_waits_summary_by_account_by_event_name;
 show create table events_waits_summary_global_by_event_name;
+show create table memory_summary_by_host_by_event_name;
+show create table memory_summary_by_thread_by_event_name;
+show create table memory_summary_by_user_by_event_name;
+show create table memory_summary_by_account_by_event_name;
+show create table memory_summary_global_by_event_name;
+show create table metadata_locks;
 show create table file_instances;
 show create table file_summary_by_event_name;
 show create table file_summary_by_instance;
@@ -53,6 +67,7 @@ show create table setup_timers;
 show create table socket_instances;
 show create table socket_summary_by_instance;
 show create table socket_summary_by_event_name;
+show create table table_handles;
 show create table table_io_waits_summary_by_index_usage;
 show create table table_io_waits_summary_by_table;
 show create table table_lock_waits_summary_by_table;
diff --git a/mysql-test/suite/perfschema/include/show_aggregate.inc b/mysql-test/suite/perfschema/include/show_aggregate.inc
new file mode 100644
index 00000000000..4489cf7a37b
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/show_aggregate.inc
@@ -0,0 +1,125 @@
+############### suite/perfschema/include/show_aggregate.inc ####################
+#                                                                              #
+# Gather status by thread, by user, by host, by account and global.            #
+#                                                                              #
+################################################################################
+
+--echo #=================
+--echo # Global results
+--echo #=================
+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');
+--echo #
+--echo # Global deltas: END - START.
+UPDATE test.status_results sr
+  SET sr.delta = sr.stop - sr.start;
+
+#--echo DEBUG
+#SELECT * FROM test.status_results;
+#SELECT * from performance_schema.global_status where variable_name in ('handler_delete', 'handler_rollback');
+
+--echo #=================
+--echo # Status by thread
+--echo #=================
+--echo # 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;
+--echo #
+--echo # 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;
+--echo #
+--echo # 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;
+--echo #
+--echo # Thread totals for 3 connections.
+UPDATE test.status_results sr
+  SET sr.thread = sr.t1 + sr.t2 + sr.t3;
+
+--echo #=================
+--echo # Status by user
+--echo #=================
+--echo # 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');
+--echo #
+--echo # 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');
+--echo #
+--echo # 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');
+--echo #
+--echo # Status totals for 3 users.
+UPDATE test.status_results sr
+  SET sr.user = sr.u1 + sr.u2 + sr.u3;
+
+--echo #===========================
+--echo # Status by host (localhost)
+--echo #===========================
+--echo #
+--echo # 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');
+--echo #
+--echo # Status totals for 'localhost' only.
+UPDATE test.status_results sr
+  SET sr.host = sr.h1 + sr.h2 + sr.h3;
+
+--echo #==================
+--echo # Status by account
+--echo #==================
+--echo # 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');
+--echo #
+--echo # 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');
+--echo #
+--echo # 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');
+--echo #
+--echo #
+--echo # Status totals for 3 accounts.
+UPDATE test.status_results sr
+  SET sr.acct = sr.a1 + sr.a2 + sr.a3;
+
+#--echo DEBUG
+#SELECT * FROM test.status_results;
diff --git a/mysql-test/suite/perfschema/include/show_plugin_verifier.inc b/mysql-test/suite/perfschema/include/show_plugin_verifier.inc
new file mode 100644
index 00000000000..873205ad16e
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/show_plugin_verifier.inc
@@ -0,0 +1,29 @@
+--disable_warnings
+
+--echo #
+SHOW GLOBAL STATUS LIKE "example_%";
+--echo #
+SHOW SESSION STATUS LIKE "example_%";
+--echo #
+SHOW GLOBAL VARIABLES LIKE "example_%";
+--echo #
+SHOW SESSION VARIABLES LIKE "example_%";
+--echo #
+SELECT variable_name, variable_value FROM performance_schema.global_status WHERE variable_name LIKE "example_%";
+--echo #
+SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
+--echo #
+SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
+--echo #
+SELECT variable_name, variable_value FROM performance_schema.session_variables WHERE variable_name LIKE "example_%";
+
+#
+# Force sync of local and global system variables.
+#
+--disable_result_log
+--disable_query_log
+SELECT variable_name, variable_value FROM performance_schema.variables_by_thread WHERE variable_name LIKE "example_%";
+--enable_query_log
+--enable_result_log
+
+--enable_warnings
diff --git a/mysql-test/suite/perfschema/include/show_transaction_gtid.inc b/mysql-test/suite/perfschema/include/show_transaction_gtid.inc
new file mode 100644
index 00000000000..3ad4564dc0d
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/show_transaction_gtid.inc
@@ -0,0 +1,29 @@
+# ==== Purpose ====
+#
+# Auxiliary file used by transaction_gtid.test
+#
+# Invoked to check the contents of the
+# performance_schema.events_transaction_[current|history] tables and
+# write the result to the result log.  This is executed on the
+# 'server_1' connection and shows only status of transactions on the
+# 'default' connection.
+
+--connection server_1
+
+--replace_result $server_uuid SERVER_UUID aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa A
+--let $history_result= `SELECT GTID FROM performance_schema.events_transactions_history WHERE THREAD_ID = $thread_id`
+if ($history_result == '')
+{
+  --let $history_result= none
+}
+
+--replace_result $server_uuid SERVER_UUID aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa A
+--let $current_result= `SELECT GTID FROM performance_schema.events_transactions_current WHERE THREAD_ID = $thread_id`
+if ($current_result == '')
+{
+  --let $current_result= none
+}
+
+--echo # - history=$history_result current=$current_result
+
+--connection default
diff --git a/mysql-test/suite/perfschema/include/sizing_auto.inc b/mysql-test/suite/perfschema/include/sizing_auto.inc
deleted file mode 100644
index 6cb077e3cf7..00000000000
--- a/mysql-test/suite/perfschema/include/sizing_auto.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-
-show variables like "table_definition_cache";
-show variables like "table_open_cache";
-show variables like "max_connections";
-# open_files_limit depends on OS configuration (ulimit -n)
-show variables like "open_files_limit";
-show variables where
-    `Variable_name` != "performance_schema_max_statement_classes" and
-    `Variable_name` like "performance_schema%";
-show status like "%performance_schema%";
-
-# Each test script should provide a different test.cnf file,
-# with different settings.
-# This output will show the sizes computed automatically.
-# Note that this output is very dependent on the platform.
-# The output of SHOW ENGINE PERFORMANCE_SCHEMA STATUS
-# is very dependent on the platform,
-# so it is not printed here to ensure stability of the .results files.
-# To troubleshoot the performance schema memory consumption at different
-# configuration settings, uncomment the following line.
-# Debug only:
-
-# show engine performance_schema status;
-
diff --git a/mysql-test/suite/perfschema/include/socket_check1.inc b/mysql-test/suite/perfschema/include/socket_check1.inc
index 29b00fc6abb..4f65e7d00bd 100644
--- a/mysql-test/suite/perfschema/include/socket_check1.inc
+++ b/mysql-test/suite/perfschema/include/socket_check1.inc
@@ -63,7 +63,7 @@
 --echo # $title_prefix.$check_num Compare impact of statements
 --echo #       $stmt2
 --echo #       $stmt1
---echo $msg
+--echo # $msg
 
 # Enable this when extending the checks for SQL statements.
 if(0)
diff --git a/mysql-test/suite/perfschema/include/start_server_common.inc b/mysql-test/suite/perfschema/include/start_server_common.inc
index 8cbd40c2bc1..1297bcdff82 100644
--- a/mysql-test/suite/perfschema/include/start_server_common.inc
+++ b/mysql-test/suite/perfschema/include/start_server_common.inc
@@ -7,13 +7,13 @@ select count(*) from performance_schema.setup_consumers;
 # wait/io/table/sql/handler is a native instrument
 # wait/lock/table/sql/handler is a native instrument
 # idle/io/socket is a native instrument
-select count(*) > 3 from performance_schema.setup_instruments;
+# wait/lock/metadata is a native instrument
+select count(*) > 4 from performance_schema.setup_instruments;
 select count(*) from performance_schema.setup_timers;
 
 # Make sure we don't crash, no matter what the starting parameters are
 
 --disable_result_log
---disable_query_log
 select * from performance_schema.accounts;
 select * from performance_schema.cond_instances;
 select * from performance_schema.events_stages_current;
@@ -33,6 +33,14 @@ 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;
@@ -42,11 +50,22 @@ 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;
@@ -61,13 +80,31 @@ 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_connection_status;
+select * from performance_schema.replication_applier_configuration;
+select * from performance_schema.replication_applier_status;
+select * from performance_schema.replication_applier_status_by_coordinator;
+#select * from performance_schema.replication_applier_status_by_worker;
+select * from performance_schema.global_status;
+select * from performance_schema.status_by_thread;
+select * from performance_schema.status_by_user;
+select * from performance_schema.status_by_host;
+select * from performance_schema.status_by_account;
+select * from performance_schema.session_status;
+#select * from performance_schema.global_variables;
+#select * from performance_schema.variables_by_thread;
+#select * from performance_schema.session_variables;
 --enable_result_log
---enable_query_log
+
+# This has a stable output, printing the result:
+show global variables like "performance_schema%";
 
 # This has an unrepeatable output, it does depends too much on
 # - the platform hardware (sizeof structures, padding)
@@ -78,6 +115,6 @@ select * from performance_schema.users;
 
 --disable_result_log
 show engine PERFORMANCE_SCHEMA status;
-show status like "performance_schema%";
+show global status like "performance_schema%";
 --enable_result_log
 
diff --git a/mysql-test/suite/perfschema/include/table_aggregate_load.inc b/mysql-test/suite/perfschema/include/table_aggregate_load.inc
index 80c622d77be..9d757617cad 100644
--- a/mysql-test/suite/perfschema/include/table_aggregate_load.inc
+++ b/mysql-test/suite/perfschema/include/table_aggregate_load.inc
@@ -2,6 +2,19 @@
 #
 
 # See comments in include/table_aggregate_setup.inc
+#
+# Notes about the optimizer and query plans:
+# The following statement
+#   SELECT * from t1 where b=5;
+# can be executed either:
+# - by using the index "index_b" on column b
+# - by using a full table scan and the where clause.
+# Which plan is used can be unpredictable.
+# To ensure that the index is really used,
+# so that table io against the index is measured,
+# the payload in this test uses:
+#   SELECT * from t1 force index(index_b) where b=5;
+# 
 
 # Display the current setup used
 
@@ -88,13 +101,34 @@ 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 with index
-select * from test.t1 where b=5;
-select * from test.t2 where b=5;
-select * from test.t3 where b=5;
+select * from test.t1 force index(index_b) where b=5;
+select * from test.t2 force index(index_b) where b=5;
+select * from test.t3 force index(index_b) where b=5;
+
+--connection default
+
+echo "================== Step 3-A ==================";
+call dump_thread();
+execute dump_waits_account;
+execute dump_waits_user;
+execute dump_waits_host;
+execute dump_waits_global;
+execute dump_waits_history;
+execute dump_waits_index_io;
+execute dump_waits_table_io;
+execute dump_waits_table_lock;
+execute dump_objects_summary;
+
+--connection con1
+
+# This cause aggregation, so that index names are finally recorded
+flush tables;
+
+echo "================== con1 FLUSH ==================";
 
 --connection default
 
-echo "================== Step 3 ==================";
+echo "================== Step 3-B ==================";
 call dump_thread();
 execute dump_waits_account;
 execute dump_waits_user;
@@ -147,9 +181,9 @@ 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 with index
-select * from test.t1 where b=5;
-select * from test.t2 where b=5;
-select * from test.t3 where b=5;
+select * from test.t1 force index(index_b) where b=5;
+select * from test.t2 force index(index_b) where b=5;
+select * from test.t3 force index(index_b) where b=5;
 
 --connection default
 
@@ -202,9 +236,9 @@ 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 with index
-select * from test.t1 where b=5;
-select * from test.t2 where b=5;
-select * from test.t3 where b=5;
+select * from test.t1 force index(index_b) where b=5;
+select * from test.t2 force index(index_b) where b=5;
+select * from test.t3 force index(index_b) where b=5;
 
 --connection default
 
@@ -257,9 +291,9 @@ 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 with index
-select * from test.t1 where b=5;
-select * from test.t2 where b=5;
-select * from test.t3 where b=5;
+select * from test.t1 force index(index_b) where b=5;
+select * from test.t2 force index(index_b) where b=5;
+select * from test.t3 force index(index_b) where b=5;
 
 --connection default
 
@@ -494,4 +528,5 @@ execute dump_waits_table_lock;
 execute dump_objects_summary;
 
 # On test failures, may help to track the root cause
-show status like "performance_schema%";
+show global status like "performance_schema%";
+
diff --git a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc
index 79aa5482838..79f7bd70a3f 100644
--- a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc
+++ b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc
@@ -222,7 +222,9 @@ prepare dump_waits_global from
   order by event_name;";
 
 prepare dump_waits_history from
-  "select event_name, count(event_name), object_type, object_schema, object_name
+  "select event_name,
+    sum(if(number_of_bytes is null, 1, number_of_bytes)) as 'count(event_name)',
+    object_type, object_schema, object_name
   from performance_schema.events_waits_history_long
   where event_name in
   (\'wait/io/table/sql/handler\',
@@ -254,7 +256,7 @@ prepare dump_waits_table_lock from
   count_read_normal, count_read_with_shared_locks,
   count_read_high_priority, count_read_no_insert,
   count_read_external,
-  count_write_delayed, count_write_low_priority,
+  count_write_low_priority,
   count_write_external
   from performance_schema.table_lock_waits_summary_by_table
   where object_type='TABLE' and object_schema='test'
diff --git a/mysql-test/suite/perfschema/include/table_io_result_helper.inc b/mysql-test/suite/perfschema/include/table_io_result_helper.inc
index 4732806488e..66431b6a8c6 100644
--- a/mysql-test/suite/perfschema/include/table_io_result_helper.inc
+++ b/mysql-test/suite/perfschema/include/table_io_result_helper.inc
@@ -14,8 +14,7 @@ eval select event_name,
   order by thread_id, event_id;
 
 # In case of failures, this will tell if table io are lost.
-show status where Variable_name like 'performance_schema_%' and
-                  Variable_name not like 'performance_schema_%_classes_lost';
+show global status like 'performance_schema_%';
 
 # Cleanup
 truncate performance_schema.events_waits_history_long;
diff --git a/mysql-test/suite/perfschema/include/transaction_cleanup.inc b/mysql-test/suite/perfschema/include/transaction_cleanup.inc
new file mode 100644
index 00000000000..3b8ed02d6b6
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/transaction_cleanup.inc
@@ -0,0 +1,12 @@
+# Tests for the performance schema
+
+# ==========================================
+# HELPER include/transaction_cleanup.inc
+# ==========================================
+
+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/include/transaction_nested_events_verifier.inc b/mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc
new file mode 100644
index 00000000000..baee5e840a5
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc
@@ -0,0 +1,145 @@
+# Tests for the performance schema
+
+# =====================================================
+# HELPER include/transaction_nested_events_verifier.inc
+# =====================================================
+
+--connection default
+--disable_query_log
+
+# Poll till the activity of the actor connection con1 caused by the last
+# statement issued has finished.
+let $wait_timeout= 10;
+let $wait_condition=
+  SELECT COUNT(*) > 0 FROM performance_schema.threads
+  WHERE THREAD_ID = @con1_thread_id
+    AND PROCESSLIST_COMMAND = 'Sleep';
+--source include/wait_condition.inc
+if(!$success)
+{
+  --echo # The activity of connection con1 did not finish.
+  SELECT thread_id , PROCESSLIST_id, PROCESSLIST_STATE, PROCESSLIST_INFO
+  FROM performance_schema.threads
+  WHERE thread_id = @con1_thread_id;
+  --echo # Abort.
+  exit;
+}
+
+--echo #========================================================================
+--echo # Verify
+--echo #========================================================================
+
+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;
+
+# Debug helpers
+# set @base_event_id = 0;
+# select @base_tx_event_id, @base_stmt_event_id, @base_event_id;
+
+--echo #
+--echo # EVENTS_TRANSACTIONS_CURRENT
+--echo #
+
+--replace_column 1 thread_id
+
+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;
+
+--echo #
+--echo # EVENTS_TRANSACTIONS_HISTORY_LONG
+--echo #
+
+--replace_column 1 thread_id
+
+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;
+
+--echo #
+--echo # EVENTS_STATEMENTS_HISTORY_LONG
+--echo #
+
+--replace_column 1 thread_id
+
+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;
+
+--echo #
+--echo ### Combined statement and transaction event history ordered by event id
+--echo #
+--echo #EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
+--echo #
+
+--replace_column 1 thread_id
+
+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;
+
+--echo #
+--echo ### Clear statement and transaction history
+--echo # CALL test.clear_history();
+CALL test.clear_history();
+--enable_query_log
+--echo ## Reset db.t1
+DELETE FROM db.t1;
+--echo #
diff --git a/mysql-test/suite/perfschema/include/transaction_setup.inc b/mysql-test/suite/perfschema/include/transaction_setup.inc
new file mode 100644
index 00000000000..78697425731
--- /dev/null
+++ b/mysql-test/suite/perfschema/include/transaction_setup.inc
@@ -0,0 +1,231 @@
+# Tests for the performance schema
+
+# ==========================================
+# HELPER include/transaction_setup.inc
+# ==========================================
+
+#
+# UTILITY QUERIES
+#
+let $get_thread_id=
+  SELECT thread_id INTO @my_thread_id
+  FROM performance_schema.threads
+  WHERE processlist_id = connection_id();
+
+let $disable_instruments=
+  UPDATE performance_schema.setup_instruments
+  SET enabled='no', timed='no'
+  WHERE name IN ('transaction');
+
+let $enable_instruments=
+  UPDATE performance_schema.setup_instruments
+  SET enabled='yes', timed='yes'
+  WHERE name IN ('transaction');
+
+let $def_count = -1;
+
+--disable_warnings
+DROP PROCEDURE IF EXISTS clear_transaction_tables;
+--enable_warnings
+
+--disable_result_log
+
+DELIMITER $$;
+CREATE PROCEDURE clear_transaction_tables()
+BEGIN
+  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_transactions_summary_by_thread_by_event_name;
+  truncate table performance_schema.events_transactions_summary_by_account_by_event_name;
+  truncate table performance_schema.events_transactions_summary_by_host_by_event_name;
+  truncate table performance_schema.events_transactions_summary_by_user_by_event_name;
+  truncate table performance_schema.events_transactions_summary_global_by_event_name;
+END$$
+
+CREATE PROCEDURE clear_transaction_history()
+BEGIN
+  truncate table performance_schema.events_transactions_current;
+  truncate table performance_schema.events_transactions_history;
+  truncate table performance_schema.events_transactions_history_long;
+END$$
+
+CREATE PROCEDURE clear_statement_history()
+BEGIN
+  truncate table performance_schema.events_statements_current;
+  truncate table performance_schema.events_statements_history;
+  truncate table performance_schema.events_statements_history_long;
+END$$
+
+CREATE PROCEDURE clear_history()
+BEGIN
+  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_transactions_current;
+  truncate table performance_schema.events_transactions_history;
+  truncate table performance_schema.events_transactions_history_long;
+END$$
+
+CREATE PROCEDURE transaction_verifier(IN i_table INT,
+                                      IN i_thread_id INT,
+                                      IN i_event_name VARCHAR(64),
+                                      IN i_state VARCHAR(32),
+                                      IN i_xid_format_id INT,
+                                      IN i_xid_gtrid VARCHAR(130),
+                                      IN i_xid_bqual VARCHAR(130),
+                                      IN i_xa_state VARCHAR(64),
+                                      IN i_gtid VARCHAR(64),
+                                      IN i_access_mode VARCHAR(32),
+                                      IN i_isolation_level VARCHAR(64),
+                                      IN i_autocommit VARCHAR(16),
+                                      IN i_savepoints INT,
+                                      IN i_rb_savepoint INT,
+                                      IN i_rel_savepoint INT,
+                                      IN i_expected INT)
+BEGIN
+  DECLARE table_name VARCHAR(64);
+  SET @thread_id       = i_thread_id;
+  SET @event_id        = 0;
+  SET @event_name      = i_event_name;
+  SET @state           = i_state;
+  SET @xid_format_id   = i_xid_format_id;
+  SET @xid_gtrid       = i_xid_gtrid;
+  SET @xid_bqual       = i_xid_bqual;
+  SET @xa_state        = i_xa_state;
+  SET @gtid            = i_gtid;
+  SET @access_mode     = i_access_mode;
+  SET @isolation_level = i_isolation_level;
+  SET @autocommit      = i_autocommit;
+  SET @savepoints      = i_savepoints;
+  SET @rb_savepoint    = i_rb_savepoint;
+  SET @rel_savepoint   = i_rel_savepoint;
+  SET @expected        = i_expected;
+
+  #
+  # Build verification query based upon input parameters
+  #
+
+  IF i_table = 0 THEN
+    SET table_name = 'performance_schema.events_transactions_current';
+  ELSEIF i_table = 1 THEN
+    SET table_name = 'performance_schema.events_transactions_history';
+  ELSEIF i_table = 2 THEN
+    SET table_name = 'performance_schema.events_transactions_history_long';
+  ELSE
+    SET table_name = 'performance_schema.events_transactions_history';
+  END IF;
+
+  SET @query = CONCAT('SELECT COUNT(*) INTO @actual FROM ', table_name, ' WHERE');
+
+  IF i_thread_id != 0 THEN
+    SET @query = CONCAT(@query, ' (thread_id = @thread_id)');
+  END IF;
+  IF i_event_name != '' THEN
+    SET @query = CONCAT(@query, ' AND (event_name = @event_name)');
+  END IF;
+  IF i_state != '' THEN
+    SET @query = CONCAT(@query, ' AND (state = @state)');
+  END IF;
+  IF i_xid_format_id != '' THEN
+    SET @query = CONCAT(@query, ' AND (xid_format_id = @xid_format_id)');
+  END IF;
+  IF i_xid_gtrid != '' THEN
+    SET @query = CONCAT(@query, ' AND (xid_gtrid = @xid_gtrid)');
+  END IF;
+  IF i_xid_bqual != '' THEN
+    SET @query = CONCAT(@query, ' AND (xid_bqual = @xid_bqual)');
+  END IF;
+  IF i_xa_state != '' THEN
+    SET @query = CONCAT(@query, ' AND (xa_state = @xa_state)');
+  END IF;
+  IF i_gtid = 'NULL' THEN
+    SET @query = CONCAT(@query, ' AND (gtid IS NULL)');
+  ELSEIF i_gtid != '' THEN
+    SET @query = CONCAT(@query, ' AND (gtid = @gtid)');
+  END IF;
+  IF i_access_mode != '' THEN
+    SET @query = CONCAT(@query, ' AND (access_mode = @access_mode)');
+  END IF;
+  IF i_isolation_level != '' THEN
+    SET @query = CONCAT(@query, ' AND (isolation_level = @isolation_level)');
+  END IF;
+  IF i_autocommit != '' THEN
+    SET @query = CONCAT(@query, ' AND (autocommit = @autocommit)');
+  END IF;
+  IF i_savepoints != 0 THEN
+    SET @query = CONCAT(@query, ' AND (number_of_savepoints = @savepoints)');
+  END IF;
+  IF i_rb_savepoint != 0 THEN
+    SET @query = CONCAT(@query, ' AND (number_of_rollback_to_savepoint = @rb_savepoint)');
+  END IF;
+  IF i_rel_savepoint != 0 THEN
+    SET @query = CONCAT(@query, ' AND (number_of_release_savepoint = @rel_savepoint)');
+  END IF;
+ 
+  SET @query = CONCAT(@query, ' ORDER BY event_id;');
+
+  ## DEBUG ## SELECT * FROM performance_schema.events_transactions_history ORDER BY event_id;
+  ## SELECT @query AS "QUERY";
+  PREPARE stmt1 FROM @query;
+  EXECUTE stmt1;
+  DEALLOCATE PREPARE stmt1;
+
+  SELECT LPAD(@actual, 6, ' ') AS "ACTUAL", LPAD(@expected, 8, ' ') AS "EXPECTED";
+
+  IF @actual != @expected THEN
+    SELECT "" AS "ERROR: Row count mismatch";
+    SELECT @query AS "VERIFIER QUERY:";
+    SELECT "";
+
+    SET @columns =                  ' LPAD(@thread_id, 9, " ")      AS thread_id,';
+    SET @columns = CONCAT(@columns, ' LPAD(@event_id, 10, " ")      AS "..event_id",');
+    SET @columns = CONCAT(@columns, ' RPAD(@event_name, 11, " ")    AS "event_name ",');
+    SET @columns = CONCAT(@columns, ' RPAD(@state, 11, " ")         AS "state      ",');
+    SET @columns = CONCAT(@columns, ' RPAD(@xid_format_id, 15, " ") AS "xid_format_id  ",');
+    SET @columns = CONCAT(@columns, ' RPAD(@xid_gtrid, 15, " ")     AS "xid_gtrid      ",');
+    SET @columns = CONCAT(@columns, ' RPAD(@xid_bqual, 15, " ")     AS "xid_bqual      ",');
+    SET @columns = CONCAT(@columns, ' RPAD(@xa_state, 12, " ")      AS "xa_state    ",');
+    SET @columns = CONCAT(@columns, ' RPAD(@gtid, 38, " ")          AS "gtid                                  ",');
+    SET @columns = CONCAT(@columns, ' RPAD(@access_mode, 11, " ")   AS access_mode,');
+    SET @columns = CONCAT(@columns, ' RPAD(@isolation_level, 16, " ") AS "isolation_level ",');
+    SET @columns = CONCAT(@columns, ' RPAD(@autocommit, 10, " ")    AS autocommit,');
+    SET @columns = CONCAT(@columns, ' LPAD(@savepoints, 10, " ")    AS savepoints,');
+    SET @columns = CONCAT(@columns, ' LPAD(@rb_savepoint, 21, " ")  AS rollback_to_savepoint,');
+    SET @columns = CONCAT(@columns, ' LPAD(@rel_savepoint, 17, " ") AS release_savepoint');
+    SET @query2  = CONCAT('SELECT', ' LPAD(@expected, 13, " ")      AS ROWS_EXPECTED, ', @columns, ';');
+#   SET @query2  = CONCAT('SELECT "        " AS EXPECTED, ', @columns, ';');
+    PREPARE stmt2 FROM @query2;
+    EXECUTE stmt2;
+    DEALLOCATE PREPARE stmt2;
+
+    SET @columns =                  ' LPAD(thread_id, 9, " ")        AS thread_id,';
+    SET @columns = CONCAT(@columns, ' LPAD(event_id, 10, " ")        AS "..event_id",');
+    SET @columns = CONCAT(@columns, ' RPAD(event_name, 11, " ")      AS "event_name ",');
+    SET @columns = CONCAT(@columns, ' RPAD(state, 11, " ")           AS "state      ",');
+    SET @columns = CONCAT(@columns, ' RPAD(IFNULL(xid_format_id, "NULL"), 15, " ") AS "xid_format_id  ",');
+    SET @columns = CONCAT(@columns, ' RPAD(IFNULL(xid_gtrid, "NULL"), 15, " ") AS "xid_gtrid      ",');
+    SET @columns = CONCAT(@columns, ' RPAD(IFNULL(xid_bqual, "NULL"), 15, " ") AS "xid_bqual      ",');
+    SET @columns = CONCAT(@columns, ' RPAD(IFNULL(xa_state, "NULL"), 12, " ") AS "xa_state    ",');
+    SET @columns = CONCAT(@columns, ' RPAD(IFNULL(gtid, "NULL"), 38, " ") AS "gtid                                  ",');
+    SET @columns = CONCAT(@columns, ' RPAD(access_mode, 11, " ")     AS access_mode,');
+    SET @columns = CONCAT(@columns, ' RPAD(isolation_level, 16, " ") AS "isolation_level ",');
+    SET @columns = CONCAT(@columns, ' RPAD(autocommit, 10, " ")      AS autocommit,');
+    SET @columns = CONCAT(@columns, ' LPAD(number_of_savepoints, 10, " ") AS savepoints,');
+    SET @columns = CONCAT(@columns, ' LPAD(number_of_rollback_to_savepoint, 21, " ") AS rollback_to_savepoint,');
+    SET @columns = CONCAT(@columns, ' LPAD(number_of_release_savepoint, 17, " ") AS release_savepoint');
+#   SET @query3  = CONCAT('SELECT "        " AS "ACTUAL  ", ', @columns, ' FROM ', table_name, ' ORDER BY event_id;');
+    SET @query3  = CONCAT('SELECT', ' LPAD(@actual, 13, " ")        AS "ROWS_ACTUAL  ",', @columns, ' FROM ', table_name, ' ORDER BY event_id;');
+    PREPARE stmt3 FROM @query3;
+    EXECUTE stmt3;
+    DEALLOCATE PREPARE stmt3;
+
+  END IF;
+END$$
+
+DELIMITER ;$$
+
+--enable_result_log
+
+
+
diff --git a/mysql-test/suite/perfschema/include/upgrade_check.inc b/mysql-test/suite/perfschema/include/upgrade_check.inc
index 79a81311b05..c16e90c78c2 100644
--- a/mysql-test/suite/perfschema/include/upgrade_check.inc
+++ b/mysql-test/suite/perfschema/include/upgrade_check.inc
@@ -13,4 +13,3 @@
 --remove_file $MYSQLTEST_VARDIR/tmp/out_file
 --remove_file $MYSQLTEST_VARDIR/tmp/err_file
 --remove_file $MYSQLD_DATADIR/mysql_upgrade_info
-
diff --git a/mysql-test/suite/perfschema/include/wait_for_pfs_thread_count.inc b/mysql-test/suite/perfschema/include/wait_for_pfs_thread_count.inc
index a2ed41d9d1b..2375bdf1cac 100644
--- a/mysql-test/suite/perfschema/include/wait_for_pfs_thread_count.inc
+++ b/mysql-test/suite/perfschema/include/wait_for_pfs_thread_count.inc
@@ -14,7 +14,7 @@ let $wait_condition=
 # Because instrumentation is optional, we use "<=" here.
 
 let $wait_condition=
-  select count(*) <= 1 from performance_schema.threads
+  select count(*) <= 2 from performance_schema.threads
   where `TYPE`='FOREGROUND';
 --source include/wait_condition.inc
 
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..08c2c3a6145
--- /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..d0415cf8df6
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/connection_type_notwin.result
@@ -0,0 +1,79 @@
+# 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,,;
+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,;
+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;
+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..8dc064babff
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/connection_type_win.result
@@ -0,0 +1,78 @@
+# 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,,;
+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,;
+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;
+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_stages_current.result b/mysql-test/suite/perfschema/r/dml_events_stages_current.result
index 326f87644ea..5b8d0c61de4 100644
--- a/mysql-test/suite/perfschema/r/dml_events_stages_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_stages_current.result
@@ -38,5 +38,7 @@ SOURCE	Name and line number of the source file containing the instrumented code
 TIMER_START	Value in picoseconds when the event timing started or NULL if timing is not collected.
 TIMER_END	Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.
 TIMER_WAIT	Value in picoseconds of the event's duration or NULL if the event has not ended or timing is not collected.
+WORK_COMPLETED	
+WORK_ESTIMATED	
 NESTING_EVENT_ID	EVENT_ID of event within which this event nests.
 NESTING_EVENT_TYPE	Nesting event type. Either statement, stage or wait.
diff --git a/mysql-test/suite/perfschema/r/dml_events_stages_history.result b/mysql-test/suite/perfschema/r/dml_events_stages_history.result
index b00963e5bd9..d76e2c2e7df 100644
--- a/mysql-test/suite/perfschema/r/dml_events_stages_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_stages_history.result
@@ -42,5 +42,7 @@ SOURCE	Name and line number of the source file containing the instrumented code
 TIMER_START	Value in picoseconds when the event timing started or NULL if timing is not collected.
 TIMER_END	Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.
 TIMER_WAIT	Value in picoseconds of the event's duration or NULL if the event has not ended or timing is not collected.
+WORK_COMPLETED	
+WORK_ESTIMATED	
 NESTING_EVENT_ID	EVENT_ID of event within which this event nests.
 NESTING_EVENT_TYPE	Nesting event type. Either statement, stage or wait.
diff --git a/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result b/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result
index 9c20113b2af..4eeb1f8dc2e 100644
--- a/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_stages_history_long.result
@@ -42,5 +42,7 @@ SOURCE	Name and line number of the source file containing the instrumented code
 TIMER_START	Value in picoseconds when the event timing started or NULL if timing is not collected.
 TIMER_END	Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.
 TIMER_WAIT	Value in picoseconds of the event's duration or NULL if the event has not ended or timing is not collected.
+WORK_COMPLETED	
+WORK_ESTIMATED	
 NESTING_EVENT_ID	EVENT_ID of event within which this event nests.
 NESTING_EVENT_TYPE	Nesting event type. Either statement, stage or wait.
diff --git a/mysql-test/suite/perfschema/r/dml_events_statements_current.result b/mysql-test/suite/perfschema/r/dml_events_statements_current.result
index 5f3b0f221c0..45e3682439c 100644
--- a/mysql-test/suite/perfschema/r/dml_events_statements_current.result
+++ b/mysql-test/suite/perfschema/r/dml_events_statements_current.result
@@ -70,3 +70,4 @@ NO_INDEX_USED	0 if the statement performed a table scan with an index, 1 if with
 NO_GOOD_INDEX_USED	0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.
 NESTING_EVENT_ID	Reserved, currently NULL.
 NESTING_EVENT_TYPE	Reserved, currently NULL.
+NESTING_EVENT_LEVEL	
diff --git a/mysql-test/suite/perfschema/r/dml_events_statements_history.result b/mysql-test/suite/perfschema/r/dml_events_statements_history.result
index f5f77bfdfb5..b96d7497037 100644
--- a/mysql-test/suite/perfschema/r/dml_events_statements_history.result
+++ b/mysql-test/suite/perfschema/r/dml_events_statements_history.result
@@ -74,3 +74,4 @@ NO_INDEX_USED	0 if the statement performed a table scan with an index, 1 if with
 NO_GOOD_INDEX_USED	0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.
 NESTING_EVENT_ID	Reserved, currently NULL.
 NESTING_EVENT_TYPE	Reserved, currently NULL.
+NESTING_EVENT_LEVEL	
diff --git a/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result b/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result
index e8b58122b16..ce89c5e6219 100644
--- a/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result
+++ b/mysql-test/suite/perfschema/r/dml_events_statements_history_long.result
@@ -74,3 +74,4 @@ NO_INDEX_USED	0 if the statement performed a table scan with an index, 1 if with
 NO_GOOD_INDEX_USED	0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.
 NESTING_EVENT_ID	Reserved, currently NULL.
 NESTING_EVENT_TYPE	Reserved, currently NULL.
+NESTING_EVENT_LEVEL	
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 3ecbc18c0ad..a87d7d2b55e 100644
--- a/mysql-test/suite/perfschema/r/dml_file_instances.result
+++ b/mysql-test/suite/perfschema/r/dml_file_instances.result
@@ -28,3 +28,62 @@ column_name	column_comment
 FILE_NAME	File name.
 EVENT_NAME	Instrument name associated with the file.
 OPEN_COUNT	Open handles on the file. A value of greater than zero means that the file is currently open.
+###
+### 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.MYD
+t_db_26152751.MYI
+t_db_26152751.frm
+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.MYD
+t_db_26152751_new.MYI
+t_db_26152751_new.frm
+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.MYD
+t_db_26152751.MYI
+t_db_26152751.frm
+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..ce4ae6bf9a3 100644
--- a/mysql-test/suite/perfschema/r/dml_handler.result
+++ b/mysql-test/suite/perfschema/r/dml_handler.result
@@ -1,6 +1,6 @@
-
+#
 # Create a temporary table of performance schema table names
-
+#
 CREATE TEMPORARY TABLE table_list (id INT AUTO_INCREMENT, PRIMARY KEY (id)) AS
 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
 WHERE TABLE_SCHEMA='performance_schema'
@@ -8,118 +8,202 @@ WHERE TABLE_SCHEMA='performance_schema'
 SELECT COUNT(*) FROM table_list INTO @table_count;
 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
-
+#
 # 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 e487bb1995b..36030d383bd 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;
@@ -68,3 +112,5 @@ column_name	column_comment
 HOST	Host name, either a literal, or the % wildcard representing any host.
 USER	User name, either a literal or the % wildcard representing any name.
 ROLE	Unused
+ENABLED	
+HISTORY	
diff --git a/mysql-test/suite/perfschema/r/dml_setup_consumers.result b/mysql-test/suite/perfschema/r/dml_setup_consumers.result
index c8d4515583e..d5db0fb7a88 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 3be1da544e4..c07e66a9fa6 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
@@ -74,12 +77,14 @@ LOCK TABLES performance_schema.setup_instruments READ;
 UNLOCK TABLES;
 LOCK TABLES performance_schema.setup_instruments WRITE;
 UNLOCK TABLES;
-
+#
 # Bug#13813193 ASSERTION `TABLE->READ_SET ==
 # &TABLE->DEF_READ_SET' FAILED / MYSQL_UPDATE
-
+#
 UPDATE performance_schema.setup_instruments SET timed='NO'
 ORDER BY RAND();
+update performance_schema.setup_instruments
+set enabled='YES', TIMED='YES';
 #
 # MDEV-25325 column_comment for performance_schema tables
 #
diff --git a/mysql-test/suite/perfschema/r/dml_setup_objects.result b/mysql-test/suite/perfschema/r/dml_setup_objects.result
index 92c8cab01c7..5e6110f8683 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,6 +69,7 @@ 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;
 #
 # MDEV-25325 column_comment for performance_schema tables
 #
@@ -75,7 +77,7 @@ select column_name, column_comment
 from information_schema.columns 
 where table_schema='performance_schema' and table_name='setup_objects';
 column_name	column_comment
-OBJECT_TYPE	Type of object to instrument. Currently, only TABLE, for base table.
+OBJECT_TYPE	Type of object to instrument.
 OBJECT_SCHEMA	Schema containing the object, either the literal or % for any schema.
 OBJECT_NAME	Name of the instrumented object, either the literal or % for any object.
 ENABLED	Whether the object's events are instrumented or not. Can be disabled, in which case monitoring is not enabled for those objects.
diff --git a/mysql-test/suite/perfschema/r/dml_setup_timers.result b/mysql-test/suite/perfschema/r/dml_setup_timers.result
index 9dcc7f8e1c6..9783425a642 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,18 +73,33 @@ 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
 #
 # MDEV-25325 column_comment for performance_schema tables
 #
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_threads.result b/mysql-test/suite/perfschema/r/dml_threads.result
index a5fcc80f944..c8169a49607 100644
--- a/mysql-test/suite/perfschema/r/dml_threads.result
+++ b/mysql-test/suite/perfschema/r/dml_threads.result
@@ -53,3 +53,6 @@ PROCESSLIST_INFO	Statement being executed by the thread, or NULL if a statement
 PARENT_THREAD_ID	THREAD_ID of the parent thread, if any. Subthreads can for example be spawned as a result of INSERT DELAYED statements.
 ROLE	Unused.
 INSTRUMENTED	YES or NO for Whether the thread is instrumented or not. For foreground threads, the initial value is determined by whether there's a user/host match in the setup_actors table. Subthreads are again matched, while for background threads, this will be set to YES by default. To monitor events that the thread executes, INSTRUMENTED must be YES and the thread_instrumentation consumer in the setup_consumers table must also be YES.
+HISTORY	
+CONNECTION_TYPE	
+THREAD_OS_ID	
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 7fa08534bb1..4ad4c773941 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate.result
@@ -15,14 +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_connection_count	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_connection_count	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)
@@ -32,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;
@@ -54,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
@@ -79,8 +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_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -91,86 +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_connection_count	0
-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_connection_count	0
-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_connection_count	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	1
-wait/synch/mutex/sql/LOCK_connection_count	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	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
@@ -183,20 +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_connection_count	0
-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
@@ -206,95 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	11
+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	11
+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	11
+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	11
+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	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+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
@@ -311,14 +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_connection_count	0
-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_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -326,121 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	11
+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	11
+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	11
+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	11
+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	2
+user2	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	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
@@ -455,25 +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_connection_count	0
-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_connection_count	0
-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
@@ -481,121 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	11
+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	10
+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	21
+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	21
+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	21
+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	2
+user2	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+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
@@ -614,165 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	11
+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	10
+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	21
+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	21
+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	21
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	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
@@ -789,176 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	11
+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	10
+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	10
+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	31
+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	31
+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	31
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	6
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -979,194 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	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	4
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	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	13
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	11
+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	10
+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	10
+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	31
+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	31
+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	31
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	6
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1185,205 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1408,191 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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/synch/mutex/sql/LOCK_connection_count	1
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1619,186 +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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	2
-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_connection_count	2
-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/synch/mutex/sql/LOCK_connection_count	2
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1827,181 +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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	3
-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_connection_count	3
-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/synch/mutex/sql/LOCK_connection_count	3
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2033,175 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2234,175 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2435,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2635,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2835,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3035,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3235,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3435,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3635,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3835,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4035,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4235,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4435,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4635,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4835,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5035,174 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5222,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
@@ -5237,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5366,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
@@ -5383,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -5403,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	41
+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;
@@ -5430,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5454,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
@@ -5471,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -5491,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	41
+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;
@@ -5518,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	8
 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 19dec52aa47..9ce3bb7efe8 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_a.result
@@ -15,14 +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_connection_count	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_connection_count	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)
@@ -32,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;
@@ -54,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;
@@ -78,8 +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_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -92,20 +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_connection_count	0
-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_connection_count	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	1
-wait/synch/mutex/sql/LOCK_connection_count	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)
@@ -114,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;
@@ -141,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;
@@ -167,20 +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_connection_count	0
-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
@@ -192,80 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	11
+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	11
+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	11
+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	2
+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;
@@ -280,14 +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_connection_count	0
-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_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -297,93 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	11
+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	11
+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	11
+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	2
+user2	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;
@@ -395,25 +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_connection_count	0
-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_connection_count	0
-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
@@ -423,93 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	21
+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	21
+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	21
+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	2
+user2	transaction	2
+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;
@@ -525,19 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -545,106 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	21
+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	21
+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	21
+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	2
+user2	transaction	2
+user3	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;
@@ -657,30 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -688,106 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	31
+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	31
+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	31
+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	2
+user2	transaction	2
+user3	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	6
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -804,142 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	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	13
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	31
+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	31
+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	31
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	6
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -953,153 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1119,139 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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/synch/mutex/sql/LOCK_connection_count	1
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1273,134 +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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	2
-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_connection_count	2
-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/synch/mutex/sql/LOCK_connection_count	2
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1424,129 +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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	3
-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_connection_count	3
-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/synch/mutex/sql/LOCK_connection_count	3
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1575,121 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1719,121 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1862,121 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2006,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2149,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2292,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2435,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2578,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2721,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2864,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3007,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3150,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3293,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3436,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3579,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3722,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3850,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
@@ -3865,120 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3993,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
@@ -4010,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -4030,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	41
+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;
@@ -4057,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -4080,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
@@ -4097,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -4117,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	41
+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;
@@ -4144,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	8
 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 3aa27664cac..6590c162dda 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,8 +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_connection_count	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,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;
@@ -47,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;
@@ -64,8 +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_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -78,16 +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_connection_count	0
-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_connection_count	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)
@@ -96,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;
@@ -118,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;
@@ -126,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;
@@ -139,20 +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_connection_count	0
-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
@@ -164,67 +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_connection_count	0
-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_connection_count	0
-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	11
+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	11
+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	11
+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	2
+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;
@@ -238,14 +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_connection_count	0
-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_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -255,66 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	11
+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	11
+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;
@@ -323,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	2
+user2	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;
@@ -339,25 +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_connection_count	0
-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_connection_count	0
-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
@@ -367,80 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	21
+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	21
+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	2
+user2	transaction	2
+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;
@@ -455,19 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -475,79 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	21
+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	21
+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;
@@ -556,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	2
+user2	transaction	2
+user3	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;
@@ -573,30 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -604,93 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	31
+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	31
+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	2
+user2	transaction	2
+user3	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -706,115 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	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	13
-wait/synch/mutex/sql/LOCK_connection_count	0
-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	11
+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	10
+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	10
+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	31
+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	31
+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;
@@ -823,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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -841,140 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -993,126 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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/synch/mutex/sql/LOCK_connection_count	1
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1133,121 +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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	2
-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/synch/mutex/sql/LOCK_connection_count	2
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1270,116 +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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	3
-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/synch/mutex/sql/LOCK_connection_count	3
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1407,108 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1537,108 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1666,108 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1796,107 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1925,107 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2054,107 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2183,107 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2312,107 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2441,107 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2570,107 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2699,107 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2828,107 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2957,107 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3086,92 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -3180,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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3215,92 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -3309,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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3344,92 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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;
@@ -3438,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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3458,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
@@ -3473,92 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -3567,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3587,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
@@ -3606,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3622,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	41
+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;
@@ -3644,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -3660,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
@@ -3679,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3695,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	41
+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;
@@ -3717,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	8
 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 4d4a842948f..b7cf3b8a5ce 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,14 +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_connection_count	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_connection_count	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)
@@ -32,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;
@@ -54,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;
@@ -77,8 +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_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -93,14 +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_connection_count	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	1
-wait/synch/mutex/sql/LOCK_connection_count	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)
@@ -111,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;
@@ -133,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;
@@ -151,20 +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_connection_count	0
-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
@@ -178,19 +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_connection_count	0
-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_connection_count	0
-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
@@ -198,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	11
+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	11
+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	11
+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;
@@ -225,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	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;
@@ -249,14 +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_connection_count	0
-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_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -268,19 +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_connection_count	0
-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_connection_count	0
-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
@@ -288,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	11
+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	11
+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	11
+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;
@@ -315,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	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;
@@ -335,25 +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_connection_count	0
-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_connection_count	0
-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
@@ -365,19 +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_connection_count	0
-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_connection_count	0
-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
@@ -385,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	21
+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	21
+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	21
+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;
@@ -412,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	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;
@@ -436,19 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -458,19 +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_connection_count	0
-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_connection_count	0
-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
@@ -478,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	21
+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	21
+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	21
+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;
@@ -505,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	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;
@@ -525,30 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -558,19 +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_connection_count	0
-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_connection_count	0
-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
@@ -578,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	31
+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	31
+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	31
+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;
@@ -605,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	6
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -629,24 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -654,19 +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_connection_count	0
-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_connection_count	0
-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
@@ -674,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	31
+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	31
+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	31
+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;
@@ -701,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	6
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -721,35 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -757,19 +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_connection_count	0
-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_connection_count	0
-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
@@ -777,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	41
+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	41
+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	41
+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;
@@ -804,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -830,19 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -850,20 +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_connection_count	1
-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_connection_count	1
-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/synch/mutex/sql/LOCK_connection_count	1
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -871,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	41
+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	41
+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	41
+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;
@@ -898,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -927,14 +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_connection_count	0
-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_connection_count	0
-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
@@ -942,20 +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_connection_count	2
-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_connection_count	2
-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/synch/mutex/sql/LOCK_connection_count	2
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -963,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	41
+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	41
+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	41
+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;
@@ -990,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1021,9 +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_connection_count	0
-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
@@ -1031,20 +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_connection_count	3
-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_connection_count	3
-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/synch/mutex/sql/LOCK_connection_count	3
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1052,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	41
+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	41
+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	41
+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;
@@ -1079,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1117,20 +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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1138,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	41
+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	41
+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	41
+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;
@@ -1165,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1204,20 +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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1225,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	41
+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	41
+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	41
+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;
@@ -1252,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1290,20 +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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1311,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	41
+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	41
+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	41
+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;
@@ -1338,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1376,20 +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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1397,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	41
+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	41
+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	41
+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;
@@ -1424,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1463,19 +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_connection_count	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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1483,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	41
+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	41
+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	41
+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;
@@ -1510,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1549,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1569,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	41
+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	41
+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	41
+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;
@@ -1596,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1635,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1655,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	41
+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	41
+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	41
+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;
@@ -1682,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1721,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1741,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	41
+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	41
+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	41
+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;
@@ -1768,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1807,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1827,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	41
+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	41
+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	41
+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;
@@ -1854,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1893,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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 +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	41
+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	41
+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 +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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1979,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1999,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	41
+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;
@@ -2026,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2065,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2085,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	41
+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;
@@ -2112,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2151,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2171,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	41
+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;
@@ -2198,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2237,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2257,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	41
+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;
@@ -2284,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2323,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2343,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	41
+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;
@@ -2370,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2409,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2429,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	41
+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;
@@ -2456,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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2478,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
@@ -2495,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2515,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	41
+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;
@@ -2542,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2564,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
@@ -2581,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2601,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	41
+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;
@@ -2628,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2650,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
@@ -2667,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2687,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	41
+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;
@@ -2714,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	8
 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 db281652c0c..24de36da22b 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,8 +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_connection_count	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,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;
@@ -47,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,8 +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_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -81,8 +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_connection_count	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)
@@ -95,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;
@@ -112,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;
@@ -123,20 +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_connection_count	0
-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
@@ -152,13 +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_connection_count	0
-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
@@ -168,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	11
+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	11
+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;
@@ -190,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	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -207,14 +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_connection_count	0
-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_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -228,13 +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_connection_count	0
-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
@@ -244,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	11
+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	11
+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;
@@ -266,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	2
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	2
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -279,25 +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_connection_count	0
-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_connection_count	0
-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
@@ -311,13 +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_connection_count	0
-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
@@ -327,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	21
+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	21
+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;
@@ -349,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	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -366,19 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-user3	wait/synch/mutex/sql/LOCK_user_locks	0
 user3	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user4	not found
@@ -390,13 +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_connection_count	0
-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
@@ -406,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	21
+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	21
+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;
@@ -428,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	4
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	4
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -441,30 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -476,13 +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_connection_count	0
-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
@@ -492,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	31
+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	31
+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;
@@ -514,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	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -531,24 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -558,13 +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_connection_count	0
-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
@@ -574,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	31
+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	31
+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;
@@ -596,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	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -609,35 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -647,13 +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_connection_count	0
-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
@@ -663,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	41
+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	41
+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;
@@ -685,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -704,19 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -726,14 +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_connection_count	1
-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/synch/mutex/sql/LOCK_connection_count	1
+wait/io/file/sql/query_log	29
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -743,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	41
+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	41
+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;
@@ -765,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -787,14 +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_connection_count	0
-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_connection_count	0
-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
@@ -804,14 +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_connection_count	2
-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/synch/mutex/sql/LOCK_connection_count	2
+wait/io/file/sql/query_log	30
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -821,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	41
+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	41
+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;
@@ -843,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -867,9 +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_connection_count	0
-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
@@ -879,14 +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_connection_count	3
-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/synch/mutex/sql/LOCK_connection_count	3
+wait/io/file/sql/query_log	31
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -896,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	41
+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	41
+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;
@@ -918,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -951,14 +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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -968,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	41
+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	41
+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;
@@ -990,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1024,14 +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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1041,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	41
+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	41
+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;
@@ -1063,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1096,14 +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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1113,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	41
+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	41
+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;
@@ -1135,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1168,14 +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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1185,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	41
+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	41
+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;
@@ -1207,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1240,14 +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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1257,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	41
+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	41
+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;
@@ -1279,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1313,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1329,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	41
+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	41
+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;
@@ -1351,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1385,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1401,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	41
+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	41
+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;
@@ -1423,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1457,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1473,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	41
+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	41
+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;
@@ -1495,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1529,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1545,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	41
+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	41
+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;
@@ -1567,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1601,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1617,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	41
+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	41
+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;
@@ -1639,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1673,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1689,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	41
+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;
@@ -1711,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1745,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1761,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	41
+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;
@@ -1783,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1817,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1833,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	41
+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;
@@ -1855,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1889,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1905,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	41
+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;
@@ -1927,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -1961,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -1977,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	41
+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;
@@ -1999,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2033,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2049,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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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;
@@ -2071,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2086,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
@@ -2105,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2121,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	41
+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;
@@ -2143,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2158,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
@@ -2177,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2193,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	41
+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;
@@ -2215,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 execute dump_users;
@@ -2230,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
@@ -2249,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -2265,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	41
+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;
@@ -2287,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	8
 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 c8996fa2846..2f0c96d7234 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
@@ -17,8 +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_connection_count	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,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;
@@ -47,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
@@ -65,8 +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_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -77,61 +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_connection_count	0
-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_connection_count	0
-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_connection_count	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	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;
@@ -140,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
@@ -155,20 +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_connection_count	0
-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
@@ -178,82 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	11
+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	11
+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	11
+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	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+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
@@ -269,14 +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_connection_count	0
-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_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -284,94 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	11
+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	11
+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	11
+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;
@@ -380,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	2
+user2	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	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
@@ -399,25 +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_connection_count	0
-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_connection_count	0
-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
@@ -425,108 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	11
+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	10
+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	21
+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	21
+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	2
+user2	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+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
@@ -544,138 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	11
+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	10
+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	21
+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	21
+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;
@@ -684,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	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
@@ -705,163 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	11
+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	10
+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	10
+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	31
+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	31
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -881,167 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	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	4
-user1	wait/synch/mutex/sql/LOCK_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	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	13
-wait/synch/mutex/sql/LOCK_connection_count	0
-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	11
+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	10
+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	10
+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	11
+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	10
+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	10
+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	31
+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	31
+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;
@@ -1050,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	0
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1073,192 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1282,178 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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/synch/mutex/sql/LOCK_connection_count	1
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1479,173 +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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	2
-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/synch/mutex/sql/LOCK_connection_count	2
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1673,168 +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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	3
-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/synch/mutex/sql/LOCK_connection_count	3
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1865,162 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2052,162 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2239,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2425,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2611,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2797,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2983,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3169,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3355,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3541,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3727,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3913,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4099,161 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4285,146 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -4433,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4471,146 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -4619,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4657,146 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+user1	transaction	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	2
+user2	transaction	2
+user3	transaction	2
+user4	transaction	2
+execute dump_transactions_host;
+host	event_name	count_star
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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;
@@ -4805,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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4830,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
@@ -4845,92 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -4939,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4960,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
@@ -4979,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -4995,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	41
+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;
@@ -5017,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -5034,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
@@ -5053,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -5069,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	41
+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;
@@ -5091,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	8
 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 508a65d9ba0..618201d9b85 100644
--- a/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
+++ b/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
@@ -15,14 +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_connection_count	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_connection_count	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)
@@ -32,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;
@@ -54,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
@@ -78,8 +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_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -90,55 +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_connection_count	0
-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_connection_count	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	1
-wait/synch/mutex/sql/LOCK_connection_count	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	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;
@@ -147,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
@@ -167,20 +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_connection_count	0
-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
@@ -190,82 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	11
+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	11
+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	11
+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	2
+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
@@ -280,14 +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_connection_count	0
-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_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -295,75 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	11
+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	11
+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	11
+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;
@@ -372,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	2
+user2	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
@@ -395,25 +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_connection_count	0
-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_connection_count	0
-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
@@ -421,95 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	21
+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	21
+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	21
+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	2
+user2	localhost	transaction	2
+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
@@ -525,106 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	21
+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	21
+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	21
+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;
@@ -633,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	2
+user2	localhost	transaction	2
+user3	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
@@ -657,137 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	31
+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	31
+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	31
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	6
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -804,122 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	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	13
-localhost	wait/synch/mutex/sql/LOCK_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	31
+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	31
+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	31
+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;
@@ -928,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	0
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	6
+execute dump_transactions_global;
+event_name	count_star
+transaction	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -953,153 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1119,139 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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/synch/mutex/sql/LOCK_connection_count	1
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1273,134 +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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	2
-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_connection_count	2
-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/synch/mutex/sql/LOCK_connection_count	2
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1424,129 +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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	3
-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_connection_count	3
-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/synch/mutex/sql/LOCK_connection_count	3
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1573,123 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1717,123 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1861,122 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2004,122 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2147,122 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2290,122 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2433,122 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2576,122 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2719,122 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2862,122 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3005,122 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3148,122 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3291,101 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -3394,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3434,101 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -3537,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3577,101 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -3680,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3720,101 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+execute dump_transactions_user;
+user	event_name	count_star
+execute dump_transactions_host;
+host	event_name	count_star
+localhost	transaction	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_global;
+event_name	count_star
+transaction	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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;
@@ -3823,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3850,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
@@ -3867,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3887,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	41
+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;
@@ -3914,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3937,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
@@ -3954,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3974,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	41
+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;
@@ -4001,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -4024,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
@@ -4041,19 +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_connection_count	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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -4061,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	41
+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;
@@ -4088,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	8
 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 579fadc51c0..d6dd322a70c 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,8 +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_connection_count	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,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;
@@ -47,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,8 +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_connection_count	0
-user1	wait/synch/mutex/sql/LOCK_user_locks	0
 user1	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user2	not found
@@ -76,8 +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_connection_count	0
-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
@@ -86,36 +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_connection_count	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	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;
@@ -126,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
@@ -139,20 +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_connection_count	0
-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
@@ -162,9 +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_connection_count	0
-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
@@ -172,45 +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_connection_count	0
-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	11
+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	11
+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	11
+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;
@@ -219,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	2
+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
@@ -238,14 +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_connection_count	0
-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_connection_count	0
-user2	wait/synch/mutex/sql/LOCK_user_locks	0
 user2	wait/synch/rwlock/sql/LOCK_grant	0
 username	status
 user3	not found
@@ -253,13 +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_connection_count	0
-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_connection_count	0
-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
@@ -267,52 +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_connection_count	0
-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	11
+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	11
+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	11
+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;
@@ -323,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	2
+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	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
@@ -339,25 +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_connection_count	0
-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_connection_count	0
-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
@@ -365,13 +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_connection_count	0
-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_connection_count	0
-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
@@ -379,54 +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_connection_count	0
-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	11
+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	10
+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	21
+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	21
+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;
@@ -435,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	2
+user2	localhost	transaction	2
+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
@@ -455,35 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -491,61 +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_connection_count	0
-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	11
+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	10
+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	21
+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	21
+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;
@@ -556,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	2
+user2	localhost	transaction	2
+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	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
@@ -573,46 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -620,63 +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_connection_count	0
-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	11
+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	10
+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	10
+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	31
+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	31
+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;
@@ -685,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+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	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -706,42 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	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
@@ -749,70 +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_connection_count	0
-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	11
+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	10
+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	10
+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	31
+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	31
+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;
@@ -823,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+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	6
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	6
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -841,53 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -895,72 +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_connection_count	0
-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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -969,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -993,37 +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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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_connection_count	0
-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
@@ -1031,73 +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_connection_count	1
-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/synch/mutex/sql/LOCK_connection_count	1
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -1106,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1133,32 +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_connection_count	0
-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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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_connection_count	0
-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
@@ -1166,73 +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_connection_count	2
-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/synch/mutex/sql/LOCK_connection_count	2
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -1241,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1270,27 +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_connection_count	0
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	0
-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
@@ -1298,73 +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_connection_count	3
-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/synch/mutex/sql/LOCK_connection_count	3
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -1373,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1405,21 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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
@@ -1427,73 +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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -1502,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1535,21 +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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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_connection_count	1
-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
@@ -1557,73 +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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -1632,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1665,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -1686,73 +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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -1761,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1794,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -1815,73 +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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -1890,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -1923,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -1944,73 +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_connection_count	4
-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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -2019,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2052,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -2074,72 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -2148,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2181,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -2203,72 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	11
+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	10
+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	10
+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	10
+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	41
+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	41
+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;
@@ -2277,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2310,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -2332,72 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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;
@@ -2406,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2439,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -2461,72 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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;
@@ -2535,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2568,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -2590,72 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	41
+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;
@@ -2664,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2697,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -2719,72 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -2793,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2826,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -2848,72 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -2922,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -2955,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -2977,70 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -3051,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3084,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -3106,70 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -3180,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3213,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -3235,70 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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;
@@ -3309,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3342,20 +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_connection_count	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_connection_count	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_connection_count	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_connection_count	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
@@ -3364,70 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+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	41
+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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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;
@@ -3438,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	2
+user2	localhost	transaction	2
+user3	localhost	transaction	2
+user4	localhost	transaction	2
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
+execute dump_transactions_history;
+event_name	count(event_name)
+transaction	8
+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	41
+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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3458,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
@@ -3477,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3493,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	41
+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;
@@ -3515,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3531,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
@@ -3550,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3566,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	41
+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;
@@ -3588,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	8
 execute dump_accounts;
 USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONNECTIONS
 root	localhost	1	1
@@ -3604,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
@@ -3623,13 +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_connection_count	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/synch/mutex/sql/LOCK_connection_count	4
+wait/io/file/sql/query_log	32
 wait/synch/rwlock/sql/LOCK_grant	4
 execute dump_stages_account;
 user	host	event_name	count_star
@@ -3639,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	41
+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;
@@ -3661,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	8
 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/grant.result b/mysql-test/suite/perfschema/r/grant.result
new file mode 100644
index 00000000000..4679499279f
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/grant.result
@@ -0,0 +1,7 @@
+create user a@localhost;
+connect a,localhost,a;
+select * from performance_schema.global_status where variable_name='b';
+VARIABLE_NAME	VARIABLE_VALUE
+connection default;
+disconnect a;
+drop user a@localhost;
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
index 86cab03c4c6..d84d6a72239 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
@@ -33,7 +33,7 @@ current_user()
 root@192.0.2.4
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -70,7 +70,7 @@ current_user()
 root@192.0.2.4
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result
index f824c319afa..10861f5e352 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
index 33948013822..8e87d0dc50e 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
@@ -33,7 +33,7 @@ current_user()
 root@192.0.2.4
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@192.0.2.4
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result
index 096c5c3dbd5..3b39b09d3e1 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
index f36e4604a7c..d14a73a8f46 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
@@ -33,7 +33,7 @@ current_user()
 root@santa.claus.ipv4.example.com
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@santa.claus.ipv4.example.com
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result
index d84ffe2e9df..5cd714fba4f 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
index ff2a93efec4..c52da0dc578 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
@@ -35,7 +35,7 @@ current_user()
 root@192.0.2.4
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -72,7 +72,7 @@ current_user()
 root@192.0.2.4
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result
index c300d6a50af..b889df4e451 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_ed25519.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_ed25519.result
index fdb2c53fcf3..6e3d928509c 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_ed25519.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_ed25519.result
@@ -22,7 +22,7 @@ set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddr
 connect(127.0.0.1,plug1,foo,test,PORT,SOCKET);
 connect con1, 127.0.0.1, plug1,foo,,$MASTER_MYPORT;
 ERROR 28000: Access denied for user 'plug1'@'santa.claus.ipv4.example.com' (using password: YES)
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -53,7 +53,7 @@ LAST_ERROR_SEEN	set
 connect(127.0.0.1,plug2,bar,test,PORT,SOCKET);
 connect con1, 127.0.0.1, plug2,bar,,$MASTER_MYPORT;
 ERROR 28000: Access denied for user 'plug2'@'santa.claus.ipv4.example.com' (using password: YES)
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -87,7 +87,7 @@ current_user()
 plug2@santa.claus.ipv4.example.com
 disconnect con1;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
index 1c34faa9457..31ffb4065b9 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result
@@ -29,7 +29,7 @@ set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddr
 uninstall plugin test_plugin_server;
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -59,7 +59,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -90,7 +90,7 @@ LAST_ERROR_SEEN	set
 install plugin test_plugin_server soname 'PLUGIN_AUTH';
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -120,7 +120,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -162,7 +162,7 @@ current_user()
 plug_dest@santa.claus.ipv4.example.com
 disconnect con4;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
index 2751dbd7edb..6be60f0a070 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
@@ -29,7 +29,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply";
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -59,7 +59,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -89,7 +89,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -117,9 +117,9 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -147,9 +147,9 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -180,7 +180,7 @@ LAST_ERROR_SEEN	set
 flush hosts;
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -210,7 +210,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -245,7 +245,7 @@ Valid connection should reset SUM_CONNECT_ERROR counter
 connection default;
 set global debug_dbug= "+d,native_password_bad_reply";
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -275,7 +275,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -305,7 +305,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -335,7 +335,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -363,9 +363,9 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -393,9 +393,9 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result
index 18e437559e4..42030ed8ac0 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_format.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
index 3d41f013ba9..2ea779fd351 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
@@ -36,7 +36,7 @@ current_user()
 quota@santa.claus.ipv4.example.com
 disconnect con2a;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -73,7 +73,7 @@ current_user()
 quota@santa.claus.ipv4.example.com
 disconnect con2b;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -110,7 +110,7 @@ current_user()
 quota@santa.claus.ipv4.example.com
 disconnect con2c;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -140,7 +140,7 @@ FIRST_ERROR_SEEN	null
 LAST_ERROR_SEEN	null
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -170,7 +170,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -211,7 +211,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -247,7 +247,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -283,7 +283,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -313,7 +313,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -343,7 +343,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -386,7 +386,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -422,7 +422,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -458,7 +458,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -488,7 +488,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -518,7 +518,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -567,7 +567,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -603,7 +603,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -633,7 +633,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 Got one of the listed errors
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -663,7 +663,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 Got one of the listed errors
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
index bc7721aef30..60852eb2021 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
@@ -35,7 +35,7 @@ current_user()
 root@192.0.2.4
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -72,7 +72,7 @@ current_user()
 root@192.0.2.4
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -110,7 +110,7 @@ current_user()
 root@santa.claus.ipv4.example.com
 disconnect con4;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -147,7 +147,7 @@ current_user()
 root@santa.claus.ipv4.example.com
 disconnect con5;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result
index 3896ed086ba..c453bc35cd5 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -85,7 +85,7 @@ LAST_ERROR_SEEN	set
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -115,7 +115,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
index 236bc12d9bf..1b07f4fcd16 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
@@ -33,7 +33,7 @@ current_user()
 root@192.0.2.4
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@192.0.2.4
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result
index 5479393c29b..63baa481d09 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result
index 4c2a9d48a63..8d69d9c4d9a 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result
@@ -28,7 +28,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -58,7 +58,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -88,7 +88,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -118,7 +118,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -148,7 +148,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -178,7 +178,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result
index 267f346836d..33f3528b8b3 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result
@@ -32,7 +32,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -62,7 +62,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -92,7 +92,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -122,7 +122,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
index 4325cfec6dc..2b0f4ff7da6 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
@@ -33,7 +33,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -70,7 +70,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result
index 12435dd54f5..12b27c8ecb5 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
index 57e14dfe913..5d8d7fd3f63 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
@@ -33,7 +33,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result
index 654ed7759b1..c46ea3dc342 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
index f68d90978e7..786f1b8a6c8 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
@@ -33,7 +33,7 @@ current_user()
 root@santa.claus.ipv6.example.com
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@santa.claus.ipv6.example.com
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result
index e63c84bf352..8dfcdac1b44 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result
@@ -23,7 +23,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -53,7 +53,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
index 50297797f6a..f2aa7fe02a2 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
@@ -35,7 +35,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -72,7 +72,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result
index 549e83369df..2fda71b3c38 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result
index 5312958bd91..09b965f443b 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result
@@ -29,7 +29,7 @@ set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddr
 uninstall plugin test_plugin_server;
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -59,7 +59,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -90,7 +90,7 @@ LAST_ERROR_SEEN	set
 install plugin test_plugin_server soname 'PLUGIN_AUTH';
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -120,7 +120,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -162,7 +162,7 @@ current_user()
 plug_dest@santa.claus.ipv6.example.com
 disconnect con4;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
index 757285b1033..4cef13e028d 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
@@ -29,7 +29,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply";
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -59,7 +59,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -89,7 +89,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -117,9 +117,9 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -147,9 +147,9 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -180,7 +180,7 @@ LAST_ERROR_SEEN	set
 flush hosts;
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -210,7 +210,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -245,7 +245,7 @@ Valid connection should reset SUM_CONNECT_ERROR counter
 connection default;
 set global debug_dbug= "+d,native_password_bad_reply";
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -275,7 +275,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -305,7 +305,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -335,7 +335,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -363,9 +363,9 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -393,9 +393,9 @@ COUNT_LOCAL_ERRORS	0
 COUNT_UNKNOWN_ERRORS	0
 FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
-ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
+ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mariadb-admin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
index f2e25ab6ca1..c109fe8cff0 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
@@ -36,7 +36,7 @@ current_user()
 quota@santa.claus.ipv6.example.com
 disconnect con2a;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -73,7 +73,7 @@ current_user()
 quota@santa.claus.ipv6.example.com
 disconnect con2b;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -110,7 +110,7 @@ current_user()
 quota@santa.claus.ipv6.example.com
 disconnect con2c;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -140,7 +140,7 @@ FIRST_ERROR_SEEN	null
 LAST_ERROR_SEEN	null
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -170,7 +170,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -211,7 +211,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -247,7 +247,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -283,7 +283,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -313,7 +313,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -343,7 +343,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -386,7 +386,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -422,7 +422,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -458,7 +458,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -488,7 +488,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -518,7 +518,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -567,7 +567,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -603,7 +603,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -633,7 +633,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 Got one of the listed errors
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -663,7 +663,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 Got one of the listed errors
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
index 357dfd3db3e..f9c1f736365 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
@@ -35,7 +35,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -72,7 +72,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -110,7 +110,7 @@ current_user()
 root@santa.claus.ipv6.example.com
 disconnect con4;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -147,7 +147,7 @@ current_user()
 root@santa.claus.ipv6.example.com
 disconnect con5;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result
index 5befbd98087..675694d1fb9 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -85,7 +85,7 @@ LAST_ERROR_SEEN	set
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -115,7 +115,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
index f899cb935e9..b8ae214fd7a 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
@@ -33,7 +33,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result
index 6d50530ffa0..b5f098a6a1f 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result
@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result
index 670a3713d91..a6f04e0c6b6 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result
@@ -28,7 +28,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -58,7 +58,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -88,7 +88,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -118,7 +118,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -148,7 +148,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -178,7 +178,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result
index 9ec33df2fee..90c8d9cce39 100644
--- a/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result
+++ b/mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result
@@ -32,7 +32,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -62,7 +62,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -92,7 +92,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -122,7 +122,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
diff --git a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result
index 6d15f2f5b25..6aad20ec488 100644
--- a/mysql-test/suite/perfschema/r/hostcache_peer_addr.result
+++ b/mysql-test/suite/perfschema/r/hostcache_peer_addr.result
@@ -39,7 +39,7 @@ Connection_errors_max_connections	0
 Connection_errors_peer_address	1
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 ERROR HY000: Can't get hostname for your address
 connection default;
 show global status like "connection_errors_%";
@@ -50,7 +50,7 @@ Connection_errors_max_connections	0
 Connection_errors_peer_address	2
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 SET @@GLOBAL.debug_dbug = @saved_dbug;
 flush status;
 show global status like "connection_errors_%";
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_events_transactions_history_long.result b/mysql-test/suite/perfschema/r/innodb_events_transactions_history_long.result
new file mode 100644
index 00000000000..1d8c372fa39
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/innodb_events_transactions_history_long.result
@@ -0,0 +1,16 @@
+#
+# MDEV-24600 performance_schema.events_transactions_history_long.trx_id
+#            reports garbage
+#
+TRUNCATE performance_schema.events_transactions_history_long;
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+COMMIT;
+BEGIN;
+SELECT table_name FROM mysql.innodb_table_stats LIMIT 0 LOCK IN SHARE MODE;
+table_name
+COMMIT;
+SELECT state,trx_id,gtid
+FROM performance_schema.events_transactions_history_long;
+state	trx_id	gtid
+COMMITTED	NULL	0-0-0
+COMMITTED	NULL	0-0-0
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..9a7f04dace7
--- /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..83ca6d5cf3f 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;
@@ -102,7 +116,7 @@ select mysql_errno, returned_sqlstate, message_text, errors, warnings
 from performance_schema.events_statements_history where errors > 0;
 mysql_errno	returned_sqlstate	message_text	errors	warnings
 1146	42S02	Table 'test.t1' doesn't exist	1	0
-
+#
 select mysql_errno, returned_sqlstate, message_text, errors, warnings from 
 performance_schema.events_statements_history_long where errors > 0;
 mysql_errno	returned_sqlstate	message_text	errors	warnings
@@ -150,3 +164,13 @@ Warnings:
 Note	1051	Unknown table 'test.t0'
 FLUSH TABLE t0;
 DROP TABLE t0;
+#
+# MDEV-24364 Alter rename table does not remove PFS share
+#
+create or replace table yt4 (x int) engine innodb;
+alter table yt4 rename to t1, algorithm=copy;
+drop tables t1;
+select object_type, object_schema, object_name
+from performance_schema.objects_summary_global_by_type
+where object_schema="test";
+object_type	object_schema	object_name
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 6f0030489f6..ba655d3c329 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,21 +115,21 @@ 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	21	statement/sql/select	select "MARKER_BEGIN" as marker	NULL	NULL
-1	5	stage/sql/Init	(stage)	STATEMENT	0
+1	5	stage/sql/starting	(stage)	STATEMENT	0
 2	2	wait/io/socket/sql/client_connection	recv	STAGE	1
 3	3	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	1
 4	4	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	1
 5	5	wait/io/file/sql/query_log	write	STAGE	1
-6	6	stage/sql/Checking permissions	(stage)	STATEMENT	0
+6	6	stage/sql/checking permissions	(stage)	STATEMENT	0
 7	7	stage/sql/Opening tables	(stage)	STATEMENT	0
 8	8	stage/sql/After opening tables	(stage)	STATEMENT	0
-9	9	stage/sql/Init	(stage)	STATEMENT	0
+9	9	stage/sql/init	(stage)	STATEMENT	0
 10	10	stage/sql/Optimizing	(stage)	STATEMENT	0
 11	11	stage/sql/Executing	(stage)	STATEMENT	0
 12	12	stage/sql/End of update loop	(stage)	STATEMENT	0
 13	13	stage/sql/Query end	(stage)	STATEMENT	0
 14	14	stage/sql/Commit	(stage)	STATEMENT	0
-15	15	stage/sql/Closing tables	(stage)	STATEMENT	0
+15	15	stage/sql/closing tables	(stage)	STATEMENT	0
 16	16	stage/sql/Starting cleanup	(stage)	STATEMENT	0
 17	17	stage/sql/Freeing items	(stage)	STATEMENT	0
 18	18	wait/io/socket/sql/client_connection	send	STATEMENT	0
@@ -132,21 +139,21 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 22	22	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	0
 23	23	idle	idle	NULL	NULL
 24	45	statement/sql/select	select "This is simple statement one" as payload	NULL	NULL
-25	29	stage/sql/Init	(stage)	STATEMENT	24
+25	29	stage/sql/starting	(stage)	STATEMENT	24
 26	26	wait/io/socket/sql/client_connection	recv	STAGE	25
 27	27	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	25
 28	28	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	25
 29	29	wait/io/file/sql/query_log	write	STAGE	25
-30	30	stage/sql/Checking permissions	(stage)	STATEMENT	24
+30	30	stage/sql/checking permissions	(stage)	STATEMENT	24
 31	31	stage/sql/Opening tables	(stage)	STATEMENT	24
 32	32	stage/sql/After opening tables	(stage)	STATEMENT	24
-33	33	stage/sql/Init	(stage)	STATEMENT	24
+33	33	stage/sql/init	(stage)	STATEMENT	24
 34	34	stage/sql/Optimizing	(stage)	STATEMENT	24
 35	35	stage/sql/Executing	(stage)	STATEMENT	24
 36	36	stage/sql/End of update loop	(stage)	STATEMENT	24
 37	37	stage/sql/Query end	(stage)	STATEMENT	24
 38	38	stage/sql/Commit	(stage)	STATEMENT	24
-39	39	stage/sql/Closing tables	(stage)	STATEMENT	24
+39	39	stage/sql/closing tables	(stage)	STATEMENT	24
 40	40	stage/sql/Starting cleanup	(stage)	STATEMENT	24
 41	41	stage/sql/Freeing items	(stage)	STATEMENT	24
 42	42	wait/io/socket/sql/client_connection	send	STATEMENT	24
@@ -156,21 +163,21 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 46	46	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	24
 47	47	idle	idle	NULL	NULL
 48	69	statement/sql/select	select "This is simple statement two" as payload	NULL	NULL
-49	53	stage/sql/Init	(stage)	STATEMENT	48
+49	53	stage/sql/starting	(stage)	STATEMENT	48
 50	50	wait/io/socket/sql/client_connection	recv	STAGE	49
 51	51	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	49
 52	52	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	49
 53	53	wait/io/file/sql/query_log	write	STAGE	49
-54	54	stage/sql/Checking permissions	(stage)	STATEMENT	48
+54	54	stage/sql/checking permissions	(stage)	STATEMENT	48
 55	55	stage/sql/Opening tables	(stage)	STATEMENT	48
 56	56	stage/sql/After opening tables	(stage)	STATEMENT	48
-57	57	stage/sql/Init	(stage)	STATEMENT	48
+57	57	stage/sql/init	(stage)	STATEMENT	48
 58	58	stage/sql/Optimizing	(stage)	STATEMENT	48
 59	59	stage/sql/Executing	(stage)	STATEMENT	48
 60	60	stage/sql/End of update loop	(stage)	STATEMENT	48
 61	61	stage/sql/Query end	(stage)	STATEMENT	48
 62	62	stage/sql/Commit	(stage)	STATEMENT	48
-63	63	stage/sql/Closing tables	(stage)	STATEMENT	48
+63	63	stage/sql/closing tables	(stage)	STATEMENT	48
 64	64	stage/sql/Starting cleanup	(stage)	STATEMENT	48
 65	65	stage/sql/Freeing items	(stage)	STATEMENT	48
 66	66	wait/io/socket/sql/client_connection	send	STATEMENT	48
@@ -182,58 +189,58 @@ relative_event_id	relative_end_event_id	event_name	comment	nesting_event_type	re
 72	92	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
-73	78	stage/sql/Init	(stage)	STATEMENT	72
+73	78	stage/sql/starting	(stage)	STATEMENT	72
 74	74	wait/io/socket/sql/client_connection	recv	STAGE	73
 75	75	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	73
 76	76	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	73
 77	77	wait/io/file/sql/query_log	write	STAGE	73
 78	78	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	73
-79	79	stage/sql/Checking permissions	(stage)	STATEMENT	72
+79	79	stage/sql/checking permissions	(stage)	STATEMENT	72
 80	80	stage/sql/Opening tables	(stage)	STATEMENT	72
 81	81	stage/sql/After opening tables	(stage)	STATEMENT	72
-82	82	stage/sql/Init	(stage)	STATEMENT	72
+82	82	stage/sql/init	(stage)	STATEMENT	72
 83	83	stage/sql/Optimizing	(stage)	STATEMENT	72
 84	84	stage/sql/Executing	(stage)	STATEMENT	72
 85	85	stage/sql/End of update loop	(stage)	STATEMENT	72
 86	86	stage/sql/Query end	(stage)	STATEMENT	72
 87	87	stage/sql/Commit	(stage)	STATEMENT	72
-88	88	stage/sql/Closing tables	(stage)	STATEMENT	72
+88	88	stage/sql/closing tables	(stage)	STATEMENT	72
 89	89	stage/sql/Starting cleanup	(stage)	STATEMENT	72
 90	92	stage/sql/Freeing items	(stage)	STATEMENT	72
 91	91	wait/io/socket/sql/client_connection	send	STAGE	90
 92	92	wait/synch/mutex/sql/THD::LOCK_thd_kill	lock	STAGE	90
 93	110	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
-94	96	stage/sql/Init	(stage)	STATEMENT	93
+94	96	stage/sql/starting	(stage)	STATEMENT	93
 95	95	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	94
 96	96	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	94
-97	97	stage/sql/Checking permissions	(stage)	STATEMENT	93
+97	97	stage/sql/checking permissions	(stage)	STATEMENT	93
 98	98	stage/sql/Opening tables	(stage)	STATEMENT	93
 99	99	stage/sql/After opening tables	(stage)	STATEMENT	93
-100	100	stage/sql/Init	(stage)	STATEMENT	93
+100	100	stage/sql/init	(stage)	STATEMENT	93
 101	101	stage/sql/Optimizing	(stage)	STATEMENT	93
 102	102	stage/sql/Executing	(stage)	STATEMENT	93
 103	103	stage/sql/End of update loop	(stage)	STATEMENT	93
 104	104	stage/sql/Query end	(stage)	STATEMENT	93
 105	105	stage/sql/Commit	(stage)	STATEMENT	93
-106	106	stage/sql/Closing tables	(stage)	STATEMENT	93
+106	106	stage/sql/closing tables	(stage)	STATEMENT	93
 107	107	stage/sql/Starting cleanup	(stage)	STATEMENT	93
 108	110	stage/sql/Freeing items	(stage)	STATEMENT	93
 109	109	wait/io/socket/sql/client_connection	send	STAGE	108
 110	110	wait/synch/mutex/sql/THD::LOCK_thd_kill	lock	STAGE	108
 111	129	statement/sql/select	select "With a third part to make things complete" as payload	NULL	NULL
-112	113	stage/sql/Init	(stage)	STATEMENT	111
+112	113	stage/sql/starting	(stage)	STATEMENT	111
 113	113	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	112
-114	114	stage/sql/Checking permissions	(stage)	STATEMENT	111
+114	114	stage/sql/checking permissions	(stage)	STATEMENT	111
 115	115	stage/sql/Opening tables	(stage)	STATEMENT	111
 116	116	stage/sql/After opening tables	(stage)	STATEMENT	111
-117	117	stage/sql/Init	(stage)	STATEMENT	111
+117	117	stage/sql/init	(stage)	STATEMENT	111
 118	118	stage/sql/Optimizing	(stage)	STATEMENT	111
 119	119	stage/sql/Executing	(stage)	STATEMENT	111
 120	120	stage/sql/End of update loop	(stage)	STATEMENT	111
 121	121	stage/sql/Query end	(stage)	STATEMENT	111
 122	122	stage/sql/Commit	(stage)	STATEMENT	111
-123	123	stage/sql/Closing tables	(stage)	STATEMENT	111
+123	123	stage/sql/closing tables	(stage)	STATEMENT	111
 124	124	stage/sql/Starting cleanup	(stage)	STATEMENT	111
 125	125	stage/sql/Freeing items	(stage)	STATEMENT	111
 126	126	wait/io/socket/sql/client_connection	send	STATEMENT	111
@@ -243,21 +250,21 @@ select "With a third part to make things complete" as payload	NULL	NULL
 130	130	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STATEMENT	111
 131	131	idle	idle	NULL	NULL
 132	153	statement/sql/select	select "MARKER_END" as marker	NULL	NULL
-133	137	stage/sql/Init	(stage)	STATEMENT	132
+133	137	stage/sql/starting	(stage)	STATEMENT	132
 134	134	wait/io/socket/sql/client_connection	recv	STAGE	133
 135	135	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	133
 136	136	wait/synch/mutex/sql/THD::LOCK_thd_data	lock	STAGE	133
 137	137	wait/io/file/sql/query_log	write	STAGE	133
-138	138	stage/sql/Checking permissions	(stage)	STATEMENT	132
+138	138	stage/sql/checking permissions	(stage)	STATEMENT	132
 139	139	stage/sql/Opening tables	(stage)	STATEMENT	132
 140	140	stage/sql/After opening tables	(stage)	STATEMENT	132
-141	141	stage/sql/Init	(stage)	STATEMENT	132
+141	141	stage/sql/init	(stage)	STATEMENT	132
 142	142	stage/sql/Optimizing	(stage)	STATEMENT	132
 143	143	stage/sql/Executing	(stage)	STATEMENT	132
 144	144	stage/sql/End of update loop	(stage)	STATEMENT	132
 145	145	stage/sql/Query end	(stage)	STATEMENT	132
 146	146	stage/sql/Commit	(stage)	STATEMENT	132
-147	147	stage/sql/Closing tables	(stage)	STATEMENT	132
+147	147	stage/sql/closing tables	(stage)	STATEMENT	132
 148	148	stage/sql/Starting cleanup	(stage)	STATEMENT	132
 149	149	stage/sql/Freeing items	(stage)	STATEMENT	132
 150	150	wait/io/socket/sql/client_connection	send	STATEMENT	132
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/pfs_upgrade_event.result b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
index cbaeec201e0..f4cf01406d3 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
@@ -1,4 +1,4 @@
-"Testing mysql_upgrade with EVENT performance_schema.user_event"
+# Testing mysql_upgrade with EVENT performance_schema.user_event
 create event test.user_event on schedule every 1 day do
 select "not supposed to be here";
 Warnings:
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
index b91cb5d14a8..92f2a18af2f 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_func.result
@@ -1,4 +1,4 @@
-"Testing mysql_upgrade with FUNCTION performance_schema.user_func"
+# Testing mysql_upgrade with FUNCTION performance_schema.user_func
 create function test.user_func() returns integer
 return 0;
 update mysql.proc set db='performance_schema' where name='user_func';
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
index 651bc506eee..9452ec866f7 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
@@ -1,4 +1,4 @@
-"Testing mysql_upgrade with PROCEDURE performance_schema.user_proc"
+# Testing mysql_upgrade with PROCEDURE performance_schema.user_proc
 create procedure test.user_proc()
 select "Not supposed to be here";
 update mysql.proc set db='performance_schema' where name='user_proc';
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
index 5ff608a825f..0c7b024a71e 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_table.result
@@ -1,4 +1,4 @@
-"Testing mysql_upgrade with TABLE performance_schema.user_table"
+# Testing mysql_upgrade with TABLE performance_schema.user_table
 create table test.user_table(a int);
 use performance_schema;
 show tables like "user_table";
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
index 14a1d8deae4..49928bbe8e3 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_view.result
@@ -1,4 +1,4 @@
-"Testing mysql_upgrade with VIEW performance_schema.user_view"
+# Testing mysql_upgrade with VIEW performance_schema.user_view
 create view test.user_view as select "Not supposed to be here";
 use performance_schema;
 show tables like "user_view";
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 fd56d3e1776..94cc2b33b49 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,44 +112,58 @@ 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	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	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	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	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..2027456d978 100644
--- a/mysql-test/suite/perfschema/r/rpl_statements.result
+++ b/mysql-test/suite/perfschema/r/rpl_statements.result
@@ -1,14 +1,14 @@
 include/master-slave.inc
 [connection master]
-
+#
 #
 # STEP 1 - CREATE AND REPLICATE TEST TABLES
 #
 connection master;
-
-*** Create test tables
-
-show variables like 'binlog_format%';
+#
+# *** Create test tables
+#
+show global variables like 'binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
 drop table if exists test.marker;
@@ -17,73 +17,73 @@ from performance_schema.threads
 where processlist_id = connection_id();
 create table test.marker(s1 int) engine=innodb;
 connection slave;
-
-*** Clear statement events
-
+#
+# *** Clear statement events
+#
 #
 # STEP 2 - REPLICATE ONE ROW ON MASTER TO GET REPLICATION THREAD ID ON SLAVE
 #
 connection master;
-
+#
 insert into test.marker values (0);
-
+#
 connection slave;
-
-*** Verify row, get replication thread id, clear statement events
-
+#
+# *** Verify row, get replication thread id, clear statement events
+#
 select thread_id into @slave_thread_id from performance_schema.events_statements_history
 where sql_text like '%marker%';
-*** Verify row inserted on master was replicated
+# *** Verify row inserted on master was replicated
 select count(*) = 1 as 'Expect 1' from test.marker;
 Expect 1
 1
-*** Clear statement events
-
+# *** Clear statement events
+#
 #
 # STEP 3 - PERFORM DML STATEMENTS ON MASTER
 #
 connection master;
-
-show variables like 'binlog_format%';
+#
+show global variables like 'binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
-*** Clear statement events
-
-*** Create/drop table, create/drop database
-
+# *** Clear statement events
+#
+# *** Create/drop table, create/drop database
+#
 create database marker1_db;
 create database marker2_db;
 create table marker1_db.table1 (s1 int) engine=innodb;
 create table marker2_db.table1 (s1 int) engine=innodb;
 create table marker2_db.table2 (s1 int) engine=innodb;
-
-*** Transaction
+#
+# *** Transaction
 start transaction;
 insert into marker1_db.table1 values (1), (2), (3);
 insert into marker2_db.table1 values (1), (2), (3);
 commit;
-
-*** Alter
+#
+# *** Alter
 alter table marker1_db.table1 add column (s2 varchar(32));
-
-*** Insert, Update
+#
+# *** Insert, Update
 start transaction;
 insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six');
 update marker1_db.table1 set s1 = s1 + 1;
 commit;
-
-*** Rollback
+#
+# *** Rollback
 start transaction;
 insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine');
 rollback;
-
-*** Autocommit, Delete, Drop
+#
+# *** Autocommit, Delete, Drop
 delete from marker1_db.table1 where s1 > 4;
 drop table marker2_db.table1;
 drop database marker2_db;
-
-*** Examine statements events that will be compared on the slave
-
+#
+# *** Examine statements events that will be compared on the slave
+#
 select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from performance_schema.events_statements_history_long
 where sql_text like '%marker%' order by event_id;
 thread_id	event_id	event_name	current_schema	digest_text	sql_text
@@ -101,13 +101,13 @@ thread_id	event_id	event_name	current_schema	digest_text	sql_text
 [THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM `marker1_db` . `table1` WHERE `s1` > ?                      	delete from marker1_db.table1 where s1 > 4
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE `marker2_db` . `table1`                                      	drop table marker2_db.table1
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	test      	DROP SCHEMA `marker2_db`                                                	drop database marker2_db
-
+#
 #
 # STEP 4 - REPLICATE STATEMENT EVENTS ON MASTER TO SLAVE
 #
-
-*** Store statement events in holding table, then replicate
-
+#
+# *** Store statement events in holding table, then replicate
+#
 #
 # Create table to hold statement events for later comparison on the slave
 #
@@ -115,14 +115,14 @@ create table test.master_events_statements_history_long as
 (select thread_id, event_id, event_name, sql_text, digest, digest_text, current_schema, rows_affected
 from performance_schema.events_statements_history_long
 where (thread_id=@my_thread_id and digest_text like '%marker%'));
-
+#
 #
 # STEP 5 - VERIFY DML AND DDL STATEMENT EVENTS ON SLAVE
 #
 connection slave;
-
-*** List statement events from master
-
+#
+# *** List statement events from master
+#
 select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from master_events_statements_history_long order by event_id;
 thread_id	event_id	event_name	current_schema	digest_text	sql_text
 [THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	test      	CREATE SCHEMA `marker1_db`                                              	create database marker1_db
@@ -139,9 +139,9 @@ thread_id	event_id	event_name	current_schema	digest_text	sql_text
 [THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM `marker1_db` . `table1` WHERE `s1` > ?                      	delete from marker1_db.table1 where s1 > 4
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE `marker2_db` . `table1`                                      	drop table marker2_db.table1
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	test      	DROP SCHEMA `marker2_db`                                                	drop database marker2_db
-
-*** List statement events on slave
-
+#
+# *** List statement events on slave
+#
 select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from performance_schema.events_statements_history_long
 where thread_id = @slave_thread_id and sql_text like '%marker%' order by event_id;
 thread_id	event_id	event_name	current_schema	digest_text	sql_text
@@ -158,11 +158,11 @@ thread_id	event_id	event_name	current_schema	digest_text	sql_text
 [THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM `marker1_db` . `table1` WHERE `s1` > ?                      	delete from marker1_db.table1 where s1 > 4
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE `marker2_db` . `table1`                                      	DROP TABLE `marker2_db`.`table1` /* generated by server */
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	marker2_db	DROP SCHEMA `marker2_db`                                                	drop database marker2_db
+#
+# *** Compare master and slave events
+#
 
-*** Compare master and slave events
-
-
-*** Event name comparison - expect 0 mismatches
+# *** Event name comparison - expect 0 mismatches
 
 select thread_id, event_id, event_name, digest_text, sql_text from performance_schema.events_statements_history_long t1
 where t1.thread_id = @slave_thread_id and
@@ -170,14 +170,14 @@ sql_text like '%marker%' and
 not exists (select * from master_events_statements_history_long t2 where t2.event_name = t1.event_name);
 thread_id	event_id	event_name	digest_text	sql_text
 
-*** Statement digest comparison - expect 1 mismatch for DROP TABLE
+# *** Statement digest comparison - expect 1 mismatch for DROP TABLE
 
 select thread_id, event_id, event_name, digest, digest_text, sql_text from performance_schema.events_statements_history_long t1
 where t1.thread_id = @slave_thread_id and
 sql_text like '%marker%' and
 not exists (select * from master_events_statements_history_long t2 where t2.digest = t1.digest);
 thread_id	event_id	event_name	digest	digest_text	sql_text
-
+#
 #
 # STEP 6 - DISABLE REPLICATED STATEMENT EVENTS ON SLAVE
 #
@@ -186,38 +186,38 @@ update performance_schema.setup_instruments set enabled='no', timed='no'
 select * from performance_schema.setup_instruments where name like '%statement/abstract/relay_log%';
 NAME	ENABLED	TIMED
 statement/abstract/relay_log	NO	NO
-
+#
 #
 # STEP 7 - UPDATE TABLES ON MASTER, REPLICATE
 #
 connection master;
-
-*** Clear statement events
-*** Update some tables, then replicate
-
+#
+# *** Clear statement events
+# *** Update some tables, then replicate
+#
 insert into marker1_db.table1 values (999, '999'), (998, '998'), (997, '997');
-
+#
 #
 # STEP 8 - VERIFY TABLE UPDATES FROM MASTER, EXPECT NO STATEMENT EVENTS ON SLAVE
 #
 connection slave;
-
-*** Confirm rows were replicated
-
+#
+# *** Confirm rows were replicated
+#
 select * from marker1_db.table1 where s1 > 900 order by s1;
 s1	s2
 997	997
 998	998
 999	999
-
-*** Confirm that are no statements events from the replication thread
-
+#
+# *** Confirm that are no statements events from the replication thread
+#
 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
 #
-
+#
 include/rpl_end.inc
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 8b3e5eff8b7..2eb58a1d43a 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,10 +76,16 @@ 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
@@ -84,8 +112,10 @@ events_stages_current	CREATE TABLE `events_stages_current` (
   `TIMER_START` bigint(20) unsigned DEFAULT NULL COMMENT 'Value in picoseconds when the event timing started or NULL if timing is not collected.',
   `TIMER_END` bigint(20) unsigned DEFAULT NULL COMMENT 'Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.',
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL COMMENT 'Value in picoseconds of the event''s duration or NULL if the event has not ended or timing is not collected.',
+  `WORK_COMPLETED` bigint(20) unsigned DEFAULT NULL,
+  `WORK_ESTIMATED` bigint(20) unsigned DEFAULT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL COMMENT 'EVENT_ID of event within which this event nests.',
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.'
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.'
 ) 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 COMMENT 'Value in picoseconds when the event timing started or NULL if timing is not collected.',
   `TIMER_END` bigint(20) unsigned DEFAULT NULL COMMENT 'Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.',
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL COMMENT 'Value in picoseconds of the event''s duration or NULL if the event has not ended or timing is not collected.',
+  `WORK_COMPLETED` bigint(20) unsigned DEFAULT NULL,
+  `WORK_ESTIMATED` bigint(20) unsigned DEFAULT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL COMMENT 'EVENT_ID of event within which this event nests.',
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.'
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.'
 ) 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 COMMENT 'Value in picoseconds when the event timing started or NULL if timing is not collected.',
   `TIMER_END` bigint(20) unsigned DEFAULT NULL COMMENT 'Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.',
   `TIMER_WAIT` bigint(20) unsigned DEFAULT NULL COMMENT 'Value in picoseconds of the event''s duration or NULL if the event has not ended or timing is not collected.',
+  `WORK_COMPLETED` bigint(20) unsigned DEFAULT NULL,
+  `WORK_ESTIMATED` bigint(20) unsigned DEFAULT NULL,
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL COMMENT 'EVENT_ID of event within which this event nests.',
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.'
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.'
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_stages_summary_by_host_by_event_name;
 Table	Create Table
@@ -212,7 +246,8 @@ events_statements_current	CREATE TABLE `events_statements_current` (
   `NO_INDEX_USED` bigint(20) unsigned NOT NULL COMMENT '0 if the statement performed a table scan with an index, 1 if without an index.',
   `NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL COMMENT '0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.',
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL COMMENT 'Reserved, currently NULL.',
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Reserved, currently NULL.'
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Reserved, currently 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 COMMENT '0 if the statement performed a table scan with an index, 1 if without an index.',
   `NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL COMMENT '0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.',
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL COMMENT 'Reserved, currently NULL.',
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Reserved, currently NULL.'
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Reserved, currently 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 COMMENT '0 if the statement performed a table scan with an index, 1 if without an index.',
   `NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL COMMENT '0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.',
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL COMMENT 'Reserved, currently NULL.',
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Reserved, currently NULL.'
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Reserved, currently 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
@@ -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 COMMENT 'Sum of the NO_INDEX_USED column in the events_statements_current table.',
   `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL COMMENT 'Sum of the NO_GOOD_INDEX_USED column in the events_statements_current table.'
 ) 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 COMMENT 'FILE for a file object, TABLE or TEMPORARY TABLE for a table object, or NULL for a synchronization object.',
   `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL COMMENT 'Address in memory of the object.',
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL COMMENT 'EVENT_ID of event within which this event nests.',
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.',
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.',
   `OPERATION` varchar(32) NOT NULL COMMENT 'Operation type, for example read, write or lock',
   `NUMBER_OF_BYTES` bigint(20) DEFAULT NULL COMMENT 'Number of bytes that the operation read or wrote, or NULL for table I/O waits.',
   `FLAGS` int(10) unsigned DEFAULT NULL COMMENT 'Reserved for use in the future.'
@@ -526,7 +752,7 @@ events_waits_history	CREATE TABLE `events_waits_history` (
   `OBJECT_TYPE` varchar(64) DEFAULT NULL COMMENT 'FILE for a file object, TABLE or TEMPORARY TABLE for a table object, or NULL for a synchronization object.',
   `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL COMMENT 'Address in memory of the object.',
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL COMMENT 'EVENT_ID of event within which this event nests.',
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.',
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.',
   `OPERATION` varchar(32) NOT NULL COMMENT 'Operation type, for example read, write or lock',
   `NUMBER_OF_BYTES` bigint(20) DEFAULT NULL COMMENT 'Number of bytes that the operation read or wrote, or NULL for table I/O waits.',
   `FLAGS` int(10) unsigned DEFAULT NULL COMMENT 'Reserved for use in the future.'
@@ -549,7 +775,7 @@ events_waits_history_long	CREATE TABLE `events_waits_history_long` (
   `OBJECT_TYPE` varchar(64) DEFAULT NULL COMMENT 'FILE for a file object, TABLE or TEMPORARY TABLE for a table object, or NULL for a synchronization object.',
   `OBJECT_INSTANCE_BEGIN` bigint(20) unsigned NOT NULL COMMENT 'Address in memory of the object.',
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL COMMENT 'EVENT_ID of event within which this event nests.',
-  `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.',
+  `NESTING_EVENT_TYPE` enum('TRANSACTION','STATEMENT','STAGE','WAIT') DEFAULT NULL COMMENT 'Nesting event type. Either statement, stage or wait.',
   `OPERATION` varchar(32) NOT NULL COMMENT 'Operation type, for example read, write or lock',
   `NUMBER_OF_BYTES` bigint(20) DEFAULT NULL COMMENT 'Number of bytes that the operation read or wrote, or NULL for table I/O waits.',
   `FLAGS` int(10) unsigned DEFAULT NULL COMMENT 'Reserved for use in the future.'
@@ -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 COMMENT 'Average wait time of the summarized events that are timed.',
   `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL COMMENT 'Maximum wait time of the summarized events that are timed.'
 ) 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` (
@@ -763,7 +1083,9 @@ Table	Create Table
 setup_actors	CREATE TABLE `setup_actors` (
   `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%' COMMENT 'Host name, either a literal, or the % wildcard representing any host.',
   `USER` char(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%' COMMENT 'User name, either a literal or the % wildcard representing any name.',
-  `ROLE` char(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%' COMMENT 'Unused'
+  `ROLE` char(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '%' COMMENT 'Unused',
+  `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' COMMENT 'Type of object to instrument. Currently, only TABLE, for base table.',
+  `OBJECT_TYPE` enum('EVENT','FUNCTION','PROCEDURE','TABLE','TRIGGER') NOT NULL DEFAULT 'TABLE' COMMENT 'Type of object to instrument.',
   `OBJECT_SCHEMA` varchar(64) DEFAULT '%' COMMENT 'Schema containing the object, either the literal or % for any schema.',
   `OBJECT_NAME` varchar(64) NOT NULL DEFAULT '%' COMMENT 'Name of the instrumented object, either the literal or % for any object.',
   `ENABLED` enum('YES','NO') NOT NULL DEFAULT 'YES' COMMENT 'Whether the object''s events are instrumented or not. Can be disabled, in which case monitoring is not enabled for those objects.',
@@ -859,6 +1181,18 @@ socket_summary_by_event_name	CREATE TABLE `socket_summary_by_event_name` (
   `AVG_TIMER_MISC` bigint(20) unsigned NOT NULL COMMENT 'Average wait time of all miscellaneous operations that are timed.',
   `MAX_TIMER_MISC` bigint(20) unsigned NOT NULL COMMENT 'Maximum wait time of all miscellaneous operations that are timed.'
 ) 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` (
@@ -1037,7 +1371,10 @@ threads	CREATE TABLE `threads` (
   `PROCESSLIST_INFO` longtext DEFAULT NULL COMMENT 'Statement being executed by the thread, or NULL if a statement is not being executed. If a statement results in calling other statements, such as for a stored procedure, the innermost statement from the stored procedure is shown here.',
   `PARENT_THREAD_ID` bigint(20) unsigned DEFAULT NULL COMMENT 'THREAD_ID of the parent thread, if any. Subthreads can for example be spawned as a result of INSERT DELAYED statements.',
   `ROLE` varchar(64) DEFAULT NULL COMMENT 'Unused.',
-  `INSTRUMENTED` enum('YES','NO') NOT NULL COMMENT 'YES or NO for Whether the thread is instrumented or not. For foreground threads, the initial value is determined by whether there''s a user/host match in the setup_actors table. Subthreads are again matched, while for background threads, this will be set to YES by default. To monitor events that the thread executes, INSTRUMENTED must be YES and the thread_instrumentation consumer in the setup_consumers table must also be YES.'
+  `INSTRUMENTED` enum('YES','NO') NOT NULL COMMENT 'YES or NO for Whether the thread is instrumented or not. For foreground threads, the initial value is determined by whether there''s a user/host match in the setup_actors table. Subthreads are again matched, while for background threads, this will be set to YES by default. To monitor events that the thread executes, INSTRUMENTED must be YES and the thread_instrumentation consumer in the setup_consumers table must also be YES.',
+  `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
diff --git a/mysql-test/suite/perfschema/r/server_init.result b/mysql-test/suite/perfschema/r/server_init.result
index 25f3f180735..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
@@ -88,10 +76,6 @@ where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count";
 count(name)
 1
 select count(name) from mutex_instances
-where name like "wait/synch/mutex/sql/LOCK_connection_count";
-count(name)
-1
-select count(name) from mutex_instances
 where name like "wait/synch/mutex/sql/LOCK_server_started";
 count(name)
 1
@@ -104,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
@@ -124,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
@@ -150,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..7b104a56ba0
--- /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 ea611315be3..00000000000
--- a/mysql-test/suite/perfschema/r/sizing_default.result
+++ /dev/null
@@ -1,72 +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	421
-show variables like "max_connections";
-Variable_name	Value
-max_connections	151
-show variables like "open_files_limit";
-Variable_name	Value
-open_files_limit	1024
-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	20
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	20
-performance_schema_events_waits_history_long_size	1000
-performance_schema_events_waits_history_size	20
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	90
-performance_schema_max_cond_instances	1360
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	2500
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5648
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	3073
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	230
-performance_schema_max_stage_classes	160
-performance_schema_max_table_handles	2858
-performance_schema_max_table_instances	667
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	288
-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 1f63ac6015a..00000000000
--- a/mysql-test/suite/perfschema/r/sizing_high.result
+++ /dev/null
@@ -1,72 +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	397
-show variables like "max_connections";
-Variable_name	Value
-max_connections	200
-show variables like "open_files_limit";
-Variable_name	Value
-open_files_limit	1024
-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	20
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	20
-performance_schema_events_waits_history_long_size	1000
-performance_schema_events_waits_history_size	20
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	90
-performance_schema_max_cond_instances	1500
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	2500
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5858
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	3143
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	300
-performance_schema_max_stage_classes	160
-performance_schema_max_table_handles	2858
-performance_schema_max_table_instances	667
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	358
-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 d6d6baeca9a..00000000000
--- a/mysql-test/suite/perfschema/r/sizing_low.result
+++ /dev/null
@@ -1,73 +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 like "open_files_limit";
-Variable_name	Value
-open_files_limit	1024
-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	20
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	20
-performance_schema_events_waits_history_long_size	1000
-performance_schema_events_waits_history_size	20
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	90
-performance_schema_max_cond_instances	1072
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	2500
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5215
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	2929
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	86
-performance_schema_max_stage_classes	160
-performance_schema_max_table_handles	2858
-performance_schema_max_table_instances	667
-performance_schema_max_thread_classes	50
-performance_schema_max_thread_instances	143
-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
-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 f662809b5cd..00000000000
--- a/mysql-test/suite/perfschema/r/sizing_med.result
+++ /dev/null
@@ -1,72 +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 like "open_files_limit";
-Variable_name	Value
-open_files_limit	1024
-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	20
-performance_schema_events_statements_history_long_size	1000
-performance_schema_events_statements_history_size	20
-performance_schema_events_waits_history_long_size	1000
-performance_schema_events_waits_history_size	20
-performance_schema_hosts_size	100
-performance_schema_max_cond_classes	90
-performance_schema_max_cond_instances	1363
-performance_schema_max_digest_length	1024
-performance_schema_max_file_classes	50
-performance_schema_max_file_handles	32768
-performance_schema_max_file_instances	2500
-performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	5652
-performance_schema_max_rwlock_classes	40
-performance_schema_max_rwlock_instances	3075
-performance_schema_max_socket_classes	10
-performance_schema_max_socket_instances	232
-performance_schema_max_stage_classes	160
-performance_schema_max_table_handles	2858
-performance_schema_max_table_instances	667
-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 d3c0a0de0a1..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	90
-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	160
-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_connect.result b/mysql-test/suite/perfschema/r/socket_connect.result
index 304521b044f..b729b7b3840 100644
--- a/mysql-test/suite/perfschema/r/socket_connect.result
+++ b/mysql-test/suite/perfschema/r/socket_connect.result
@@ -11,21 +11,21 @@ SELECT @@port INTO @MY_MASTER_PORT;
 # 1.0 Get the default connection object_instance_begin, thread id and verify
 #     the expected number of client connections.
 #==============================================================================
-
+#
 # 1.1 Confirm only one client connection
-
+#
 SELECT COUNT(*) INTO @my_client_connections
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE "%client_connection%";
-
+#
 # 1.2 Get the default THREAD_ID;
-
+#
 SELECT THREAD_ID INTO @my_thread_id
 FROM performance_schema.threads
 WHERE PROCESSLIST_ID = CONNECTION_ID();
-
+#
 # 1.3 Get the default OBJECT_INSTANCE_BEGIN
-
+#
 SELECT OBJECT_INSTANCE_BEGIN INTO @my_object_instance_begin
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
@@ -33,27 +33,27 @@ WHERE THREAD_ID = @my_thread_id;
 # 2.0 ESTABLISH TCP/IP CONNECTION 1
 #     Connect with IP = localhost (127.0.0.1 or ::1)
 #==============================================================================
-
+#
 # 2.1 Get the connection thread id
-
+#
 SELECT THREAD_ID INTO @my_thread_id
 FROM performance_schema.threads
 WHERE PROCESSLIST_ID = CONNECTION_ID();
-
+#
 # 2.2 Get the connection object instance begin
-
+#
 SELECT OBJECT_INSTANCE_BEGIN INTO @my_object_instance_begin
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
-
+#
 # 2.3 Get the connection port
-
+#
 SELECT PORT INTO @my_port
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
-
+#
 # 2.4 Verify that the connection is 127.0.0.1 or ::1
-
+#
 SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -62,44 +62,44 @@ AND PORT= @con1_port
 AND OBJECT_INSTANCE_BEGIN= @con1_object_id;
 Expect 1
 1
-
+#
 # 2.5 Verify that the same connection is in the summary instance table
-
+#
 SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_summary_by_instance
 WHERE EVENT_NAME LIKE '%client_connection%'
   AND OBJECT_INSTANCE_BEGIN= @con1_object_id;
 Expect 1
 1
-
+#
 # Switch to connection default
-
+#
 connection default;
 #==============================================================================
 # 3.0 ESTABLISH TCP/IP CONNECTION 2
 #     Connect with IP = localhost (127.0.0.1 or ::1)
 #==============================================================================
-
+#
 # 3.1 Get the connection thread id
-
+#
 SELECT THREAD_ID INTO @my_thread_id
 FROM performance_schema.threads
 WHERE PROCESSLIST_ID = CONNECTION_ID();
-
+#
 # 3.2 Get the connection object instance begin
-
+#
 SELECT OBJECT_INSTANCE_BEGIN INTO @my_object_instance_begin
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
-
+#
 # 3.3 Get the connection port
-
+#
 SELECT PORT INTO @my_port
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
-
+#
 # 3.4 Verify that the connection is 127.0.0.1 or ::1
-
+#
 SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -108,18 +108,18 @@ AND PORT= @con2_port
 AND OBJECT_INSTANCE_BEGIN= @con2_object_id;
 Expect 1
 1
-
+#
 # 3.5 Verify that the same connection is in the summary instance table
-
+#
 SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_summary_by_instance
 WHERE EVENT_NAME LIKE '%client_connection%'
   AND OBJECT_INSTANCE_BEGIN= @con2_object_id;
 Expect 1
 1
-
+#
 # 3.6 Verify that the connection is 127.0.0.1 or ::1
-
+#
 SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -132,9 +132,9 @@ Expect 1
 # 4.0 Verify both connections exist in the instance tables
 #==============================================================================
 connection default;
-
+#
 # 4.1 Verify that there are two TCP/IP connections in the socket instance table
-
+#
 SELECT COUNT(*) = 2 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -142,9 +142,9 @@ WHERE EVENT_NAME LIKE '%client_connection%'
 AND (IP LIKE '%127.0.0.1' OR IP LIKE '%::1');
 Expect 1
 1
-
+#
 # 4.2 Verify that there are two TCP/IP connections in the summary instance table
-
+#
 SELECT COUNT(*) = 2 AS 'Expect 1'
 FROM performance_schema.socket_summary_by_instance
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -164,9 +164,9 @@ connection default;
 #==============================================================================
 # 6.0 Verify sockets were removed from the instance tables
 #==============================================================================
-
+#
 # 6.1 Verify that there are no TCP/IP connections in the socket instance table
-
-
+#
+#
 # 6.2 Verify that there are no TCP/IP connections in the summary instance table
-
+#
diff --git a/mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result b/mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result
index 455b6a2ad00..01e374ed94f 100644
--- a/mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result
+++ b/mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result
@@ -10,123 +10,123 @@ SELECT @@port INTO @MY_MASTER_PORT;
 #==============================================================================
 # 1.0 TEST INITIALIZATION
 #==============================================================================
-
+#
 # 1.1 Disable instrumentation of the default (this) connection
-
+#
 connection default;
 UPDATE performance_schema.threads
 SET INSTRUMENTED='NO' WHERE PROCESSLIST_ID = CONNECTION_ID();
-
+#
 # 1.2 Get the default THREAD_ID;
-
+#
 SELECT THREAD_ID INTO @my_thread_id
 FROM performance_schema.threads
 WHERE PROCESSLIST_ID = CONNECTION_ID();
-
+#
 # 1.3 Get the default OBJECT_INSTANCE_BEGIN
-
+#
 SELECT OBJECT_INSTANCE_BEGIN INTO @my_object_instance_begin
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
-
+#
 # 1.4 Create a test database
-
+#
 CREATE SCHEMA mysqltest;
-
+#
 # 1.5 Create a table to store summary values from socket_summary_by_instance
 and socket_summary_by_event_name
-
+#
 CREATE TABLE mysqltest.my_socket_summary AS
 SELECT * FROM performance_schema.socket_summary_by_instance
 WHERE 1 = 0;
-
+#
 # 1.6 Drop object_instance_begin from my_socket_summary
-
+#
 ALTER TABLE mysqltest.my_socket_summary
 DROP COLUMN OBJECT_INSTANCE_BEGIN;
-
+#
 # 1.7 Add an auto_inc column to my_socket_summary
-
+#
 ALTER TABLE mysqltest.my_socket_summary
 ADD COLUMN (n INT AUTO_INCREMENT, PRIMARY KEY(n));
-
+#
 # 1.8 Create test tables
-
+#
 CREATE TABLE mysqltest.t1 (n INT AUTO_INCREMENT, s1 VARCHAR(1024), PRIMARY KEY(n));
 CREATE TABLE mysqltest.t2 (n INT AUTO_INCREMENT, s1 VARCHAR(1024), PRIMARY KEY(n));
 #==============================================================================
 # 2.0 ESTABLISH CLIENT CONNECTIONS
 #==============================================================================
-
+#
 # 2.1 Connection 1 (tcp/ip, 127.0.0.1 or ::1)
-
-
+#
+#
 # 2.2 Connection 2 (localhost or unix domain socket)
-
+#
 #==============================================================================
 # 3.0 RUN THE TESTS
 #==============================================================================
-
+#
 # 3.1 Clear performance schema tables
-
+#
 TRUNCATE performance_schema.socket_summary_by_instance;
 TRUNCATE performance_schema.socket_summary_by_event_name;
-
+#
 # 3.2 Get the 'before' sum of bytes written from socket_summary_by_instance
 for later comparison to the 'after' byte count as a simple confirmation
 that the table was updated.
-
+#
 connection default;
 SELECT sum(SUM_NUMBER_OF_BYTES_WRITE) INTO @my_write_count
 FROM performance_schema.socket_summary_by_instance;
-
+#
 # 3.3 From connection 1, insert one a 1K row of data into t1
-
+#
 connection con1;
 USE mysqltest;
 INSERT INTO t1 (s1) VALUES (REPEAT('a', 1024));
 INSERT INTO t1 (s1) SELECT s1 FROM t1;
-
+#
 # 3.4 From connection 2, insert one a 1K row of data into t2
-
+#
 connection con2;
 USE mysqltest;
 INSERT INTO t2 (s1) VALUES (REPEAT('a', 1024));
 INSERT INTO t2 (s1) SELECT s1 FROM t2;
-
+#
 # 3.5 Get the 'after' sum of bytes written from socket_summary_by_instance
-
+#
 connection default;
 SELECT sum(SUM_NUMBER_OF_BYTES_WRITE) INTO @my_write_count
 FROM performance_schema.socket_summary_by_instance;
-
+#
 # 3.6 Verify that SUM_NUMBER_OF_BYTES_WRITE increased
-
-
+#
+#
 # socket_summary_by_instance was updated
-
+#
 #==============================================================================
 # 4.0 VERIFY RESULTS
 #==============================================================================
-
+#
 # 4.1 Verify that the totals in socket_summary_by_event_name are
 consistent with totals in socket_summary_by_instance
-
+#
 #==============================================================================
 # 5.0 Clean up
 #==============================================================================
-
+#
 # 5.1 Disconnect con1
-
+#
 connection con1;
 disconnect con1;
-
+#
 # 5.2 Disconnect con2
-
+#
 connection con2;
 disconnect con2;
-
+#
 # 5.3 Drop mysqltest
-
+#
 connection default;
 DROP DATABASE mysqltest;
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..a70ff6149eb 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
@@ -139,47 +140,47 @@ connection default;
 # 4.4.4 Compare impact of statements
 #       SELECT col2 FROM does_not_exist WHERE col1 = 0
 #       SELECT col2 FROM does_not_exist
-# One statement is longer than the other.
+# # One statement is longer than the other.
 # Both statements fail with the same error message (table does not exist)
 # 4.4.5 Compare impact of statements
 #       SELECT col2 FROM does_not_exist WHERE col1 A 0
 #       SELECT col2 FROM does_not_exist WHERE col1 = 0
-# Both statements have the same length and fail.
+# # Both statements have the same length and fail.
 # The length of the error messages differs.
 # 4.4.6 Compare impact of statements
 #       SELECT col2 FROM does_not_exist0123
 #       SELECT col2 FROM does_not_exist
-# Both statements fail (table does not exist).
+# # Both statements fail (table does not exist).
 # The length of the statement and the length of the error messages differs.
 # Reason for both differences is the length of the table name.
 # 4.4.7 Compare impact of statements
 #       SELECT col2 AS my_super_col FROM mysqltest.my_aux WHERE col1 = -1
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = -1
-# Both statements get an empty result set.
+# # Both statements get an empty result set.
 # The length of the statements and the length of the result sets differs.
 # Reason for both differences is the length of the some column name.
 # 4.4.8 Compare impact of statements
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 1
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = -1
-# Both statements differ in the statement length.
+# # Both statements differ in the statement length.
 # One statement earns an empty result set.
 # The other statement earns one row containing an empty string.
 # 4.4.9 Compare impact of statements
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 2
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 1
-# Both statements have the same length.
+# # Both statements have the same length.
 # One statement earns an one row containing an empty string.
 # The other statement earns one row containing a string 1 byte long.
 # 4.4.10 Compare impact of statements
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 3
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 1
-# Both statements have the same length.
+# # Both statements have the same length.
 # One statement earns an one row containing an empty string.
 # The other statement earns one row containing a string 1024 byte long.
 # 4.4.11 Compare impact of statements
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 < 2
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 1
-# Both statements have the same length.
+# # Both statements have the same length.
 # One statement earns an one row containing an empty string.
 # The other statement earns two rows containing an empty string.
 # 4.5 Check the differences caused by Connects
@@ -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..9f3726a2345
--- /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/select	beb5bd93b7e8c45bc5cb6060804988e8	SELECT ? + ? + 	SELECT ...
+statement/sql/truncate	faf6cefb662b443f05e97b5c5ab14a59	TRUNCATE TABLE 	truncat...
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..e045ff7db01
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/statement_program_nesting_event_check.result
@@ -0,0 +1,1512 @@
+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(*) = %' 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 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..af9807cbc97
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/statement_program_non_nested.result
@@ -0,0 +1,704 @@
+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(*) = %' 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 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..e7f4ba345c5
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/sxlock_func.result
@@ -0,0 +1,58 @@
+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/%" order by name;
+name
+wait/synch/sxlock/innodb/btr_search_latch
+wait/synch/sxlock/innodb/dict_operation_lock
+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/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..1cca88baf2b 100644
--- a/mysql-test/suite/perfschema/r/table_name.result
+++ b/mysql-test/suite/perfschema/r/table_name.result
@@ -1,59 +1,63 @@
-
+#
 #
 # TEST 1: Normal tables prefixed with "#sql" and "sql".
 #
 USE test;
 CREATE TABLE `#sql_1` (a int, b text);
 INSERT INTO `#sql_1` VALUES(1,'one');
-
+#
 CREATE TABLE `sql_1` (a int, b text);
 INSERT INTO `sql_1` VALUES(1,'one');
-
+#
 # Verify that the tables are treated as normal tables .
-
+#
 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
-
+#
 # Drop the tables, verify that the table objects are removed.
-
+#
 DROP TABLE `#sql_1`;
 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
-
+#
 #
 # TEST 2: Temporary tables, no special prefix.
 #
 CREATE TEMPORARY TABLE sql_temp2_myisam (a int, b text) ENGINE=MYISAM;
 INSERT INTO sql_temp2_myisam VALUES(1,'one');
-
+#
 CREATE TEMPORARY TABLE sql_temp2_innodb (a int, b text) ENGINE=INNODB;
 INSERT INTO sql_temp2_innodb VALUES(1,'one');
-
+#
 # Confirm that the temporary tables are ignored.
-
+#
 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.
-
+#
 DROP TABLE sql_temp2_myisam;
 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
-
+#
 #
 # TEST 3: Temporary tables with the "#sql" prefix.
 #
@@ -62,73 +66,78 @@ CHECK TABLE `#sql_temp3_myisam`;
 Table	Op	Msg_type	Msg_text
 test.#sql_temp3_myisam	check	status	OK
 INSERT INTO `#sql_temp3_myisam` VALUES(1,'one');
-
+#
 CREATE TEMPORARY TABLE `#sql_temp3_innodb` (a int, b text) ENGINE=INNODB;
 CHECK TABLE `#sql_temp3_innodb`;
 Table	Op	Msg_type	Msg_text
 test.#sql_temp3_innodb	check	status	OK
 INSERT INTO `#sql_temp3_innodb` VALUES(1,'one');
-
+#
 # Confirm that the temporary tables are ignored.
-
+#
 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.
-
+#
 DROP TABLE `#sql_temp3_myisam`;
 DROP TABLE `#sql_temp3_innodb`;
-
+#
 # Confirm that the temporary tables are still ignored.
-
+#
 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
-
+#
 #
 # TEST 4: Special case: MyISAM temporary tables are recreated as non-temporary
 #         when they are truncated.
 #
 CREATE TEMPORARY TABLE `sql_temp4_myisam` (a int, b text) ENGINE=MYISAM;
 INSERT INTO `sql_temp4_myisam` VALUES(1,'one');
-
+#
 CREATE TEMPORARY TABLE `#sql_temp4_myisam` (a int, b text) ENGINE=MYISAM;
 INSERT INTO `#sql_temp4_myisam` VALUES(1,'one');
-
+#
 # Confirm that the MyISAM temporary tables are ignored.
-
+#
 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.
-
+#
 TRUNCATE TABLE `sql_temp4_myisam`;
 TRUNCATE TABLE `#sql_temp4_myisam`;
-
+#
 # Confirm that the recreated MyISAM tables are still regarded as temporary and ignored.
-
+#
 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;
-
+#
 DROP TABLE `sql_temp4_myisam`;
 DROP TABLE `#sql_temp4_myisam`;
-
+#
 # Confirm that the recreated temporary tables are still ignored.
-
+#
 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
-
+#
 #
 # TEST 5: Generate temporary tables with ALTER MyISAM table.
 #
@@ -136,21 +145,23 @@ USE test;
 CREATE TABLE t1 (a int) ENGINE=MYISAM;
 INSERT INTO t1 VALUES (1), (2), (3);
 ALTER TABLE t1 ADD COLUMN (b int);
-
+#
 # Confirm that the recreated temporary tables are still ignored.
-
+#
 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
-
+#
 DROP TABLE t1;
-
+#
 # Confirm that no tables remain;
-
+#
 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 4142c6b7acd..73232c95100 100644
--- a/mysql-test/suite/perfschema/r/table_schema.result
+++ b/mysql-test/suite/perfschema/r/table_schema.result
@@ -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	Value in picoseconds when the event timing started or NULL if timing is not collected.	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	Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.	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	Value in picoseconds of the event's duration or NULL if the event has not ended or timing is not collected.	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	EVENT_ID of event within which this event nests.	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	Nesting event type. Either statement, stage or wait.	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	EVENT_ID of event within which this event nests.	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	Nesting event type. Either statement, stage or wait.	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	Thread associated with the event. Together with EVENT_ID uniquely identifies the row.	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	Thread's current event number at the start of the event. Together with THREAD_ID uniquely identifies the row.	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	NULL when the event starts, set to the thread's current event number at the end of the event.	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	Value in picoseconds when the event timing started or NULL if timing is not collected.	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	Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.	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	Value in picoseconds of the event's duration or NULL if the event has not ended or timing is not collected.	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	EVENT_ID of event within which this event nests.	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	Nesting event type. Either statement, stage or wait.	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	EVENT_ID of event within which this event nests.	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	Nesting event type. Either statement, stage or wait.	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	Thread associated with the event. Together with EVENT_ID uniquely identifies the row.	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	Thread's current event number at the start of the event. Together with THREAD_ID uniquely identifies the row.	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	NULL when the event starts, set to the thread's current event number at the end of the event.	NEVER	NULL
@@ -35,8 +39,10 @@ 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	Value in picoseconds when the event timing started or NULL if timing is not collected.	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	Value in picoseconds when the event timing ended, or NULL if the event has not ended or timing is not collected.	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	Value in picoseconds of the event's duration or NULL if the event has not ended or timing is not collected.	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	EVENT_ID of event within which this event nests.	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	Nesting event type. Either statement, stage or wait.	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	EVENT_ID of event within which this event nests.	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	Nesting event type. Either statement, stage or wait.	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	User. Used together with HOST and EVENT_NAME for grouping events.	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	Host. Used together with USER and EVENT_NAME for grouping events.	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	Event name. Used together with USER and HOST for grouping events.	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	0 if the statement performed a table scan with an index, 1 if without an index.	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	0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.	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	Reserved, currently NULL.	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	Reserved, currently NULL.	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	Reserved, currently NULL.	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	Thread associated with the event. Together with EVENT_ID uniquely identifies the row.	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	Thread's current event number at the start of the event. Together with THREAD_ID uniquely identifies the row.	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	NULL when the event starts, set to the thread's current event number at the end of the event.	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	0 if the statement performed a table scan with an index, 1 if without an index.	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	0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.	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	Reserved, currently NULL.	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	Reserved, currently NULL.	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	Reserved, currently NULL.	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	Thread associated with the event. Together with EVENT_ID uniquely identifies the row.	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	Thread's current event number at the start of the event. Together with THREAD_ID uniquely identifies the row.	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	NULL when the event starts, set to the thread's current event number at the end of the event.	NEVER	NULL
@@ -191,7 +199,8 @@ 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	0 if the statement performed a table scan with an index, 1 if without an index.	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	0 if a good index was found for the statement, 1 if no good index was found. See the Range checked for each record description in the EXPLAIN article.	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	Reserved, currently NULL.	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	Reserved, currently NULL.	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	Reserved, currently NULL.	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	User. Used together with HOST and EVENT_NAME for grouping events.	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	Host. Used together with USER and EVENT_NAME for grouping events.	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	Event name. Used together with USER and HOST for grouping events.	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	Sum of the SORT_SCAN column in the events_statements_current table.	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	Sum of the NO_INDEX_USED column in the events_statements_current table.	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	Sum of the NO_GOOD_INDEX_USED column in the events_statements_current table.	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	Thread associated with the event. Together with EVENT_NAME uniquely identifies the row.	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	Event name. Used together with THREAD_ID for grouping events.	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	Number of summarized events	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	Sum of the SORT_SCAN column in the events_statements_current table.	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	Sum of the NO_INDEX_USED column in the events_statements_current table.	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	Sum of the NO_GOOD_INDEX_USED column in the events_statements_current table.	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	Thread associated with the event. Together with EVENT_ID uniquely identifies the row.	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	Thread's current event number at the start of the event. Together with THREAD_ID uniquely identifies the row.	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	NULL when the event starts, set to the thread's current event number at the end of the event.	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	FILE for a file object, TABLE or TEMPORARY TABLE for a table object, or NULL for a synchronization object.	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	Address in memory of the object.	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	EVENT_ID of event within which this event nests.	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	Nesting event type. Either statement, stage or wait.	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	Nesting event type. Either statement, stage or wait.	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	Operation type, for example read, write or lock	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	Number of bytes that the operation read or wrote, or NULL for table I/O waits.	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	Reserved for use in the future.	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	FILE for a file object, TABLE or TEMPORARY TABLE for a table object, or NULL for a synchronization object.	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	Address in memory of the object.	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	EVENT_ID of event within which this event nests.	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	Nesting event type. Either statement, stage or wait.	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	Nesting event type. Either statement, stage or wait.	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	Operation type, for example read, write or lock	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	Number of bytes that the operation read or wrote, or NULL for table I/O waits.	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	Reserved for use in the future.	NEVER	NULL
@@ -404,7 +602,7 @@ 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	FILE for a file object, TABLE or TEMPORARY TABLE for a table object, or NULL for a synchronization object.	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	Address in memory of the object.	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	EVENT_ID of event within which this event nests.	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	Nesting event type. Either statement, stage or wait.	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	Nesting event type. Either statement, stage or wait.	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	Operation type, for example read, write or lock	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	Number of bytes that the operation read or wrote, or NULL for table I/O waits.	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	Reserved for use in the future.	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	Minimum wait time of all miscellaneous operations that are timed.	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	Average wait time of all miscellaneous operations that are timed.	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	Maximum wait time of all miscellaneous operations that are timed.	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	Host name used by the client to connect, NULL for internal threads or user sessions that failed to authenticate.	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	Current number of the host's connections.	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	Total number of the host's connections	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	Timestamp of the most recent connection attempt by the IP.	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	Timestamp of the first error seen from the IP.	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	Timestamp of the most recent error seen from the IP.	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	Instrument name associated with the mutex.	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	Memory address of the instrumented mutex.	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	The THREAD_ID of the locking thread if a thread has a mutex locked, otherwise NULL.	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	Number of timer units per second. Dependent on the processor speed.	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	Number of timer units by which timed values increase each time.	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	Minimum timer overhead, determined during initialization by calling the timer 20 times and selecting the smallest value. Total overhead will be at least double this, as the timer is called at the beginning and end of each timed event.	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	Instrument name associated with the read write lock	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	Address in memory of the instrumented lock	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	THREAD_ID of the locking thread if locked in write (exclusive) mode, otherwise NULL.	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	Attribute name.	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	Attribute value.	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	Order in which attribute was added to the connection attributes.	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	Host name, either a literal, or the % wildcard representing any host.	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	User name, either a literal or the % wildcard representing any name.	NEVER	NULL
 def	performance_schema	setup_actors	ROLE	3	'%'	NO	char	128	384	NULL	NULL	NULL	utf8	utf8_bin	char(128)			select,insert,update,references	Unused	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	Consumer name	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	YES or NO for whether or not the consumer is enabled. You can modify this column to ensure that event information is added, or is not added.	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	Instrument name	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	Whether or not the instrument is enabled. It can be disabled, and the instrument will produce no events.	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	Whether or not the instrument is timed. It can be set, but if disabled, events produced by the instrument will have NULL values for the corresponding TIMER_START, TIMER_END, and TIMER_WAIT values.	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	Type of object to instrument. Currently, only TABLE, for base table.	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	Type of object to instrument.	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	Schema containing the object, either the literal or % for any schema.	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	Name of the instrumented object, either the literal or % for any object.	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	Whether the object's events are instrumented or not. Can be disabled, in which case monitoring is not enabled for those objects.	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	Minimum wait time of all miscellaneous operations that are timed.	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	Average wait time of all miscellaneous operations that are timed.	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	Maximum wait time of all miscellaneous operations that are timed.	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	TABLE in the case of all indexes.	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	Schema name.	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	Table name.	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	THREAD_ID of the parent thread, if any. Subthreads can for example be spawned as a result of INSERT DELAYED statements.	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	Unused.	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	YES or NO for Whether the thread is instrumented or not. For foreground threads, the initial value is determined by whether there's a user/host match in the setup_actors table. Subthreads are again matched, while for background threads, this will be set to YES by default. To monitor events that the thread executes, INSTRUMENTED must be YES and the thread_instrumentation consumer in the setup_consumers table must also be YES.	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	The connection's client user name for the connection, or NULL if an internal thread.	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	Current connections for the user.	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	Total connections for the user.	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
@@ -834,4 +1193,4 @@ select count(*) from information_schema.columns
 where table_schema="performance_schema"
    and (column_comment is null or column_comment = '');
 count(*)
-0
+366
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_innodb.result b/mysql-test/suite/perfschema/r/threads_innodb.result
index 2229d972038..d79420f6fb5 100644
--- a/mysql-test/suite/perfschema/r/threads_innodb.result
+++ b/mysql-test/suite/perfschema/r/threads_innodb.result
@@ -5,14 +5,5 @@ FROM performance_schema.threads
 WHERE name LIKE 'thread/innodb/%'
 GROUP BY name;
 name	type	processlist_user	processlist_host	processlist_db	processlist_command	processlist_time	processlist_state	processlist_info	parent_thread_id	role	instrumented
-thread/innodb/io_ibuf_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/io_log_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/io_read_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/io_write_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
 thread/innodb/page_cleaner_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_error_monitor_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_lock_timeout_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_master_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_monitor_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/srv_purge_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	YES
-thread/innodb/thd_destructor_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	1	NULL	YES
+thread/innodb/thread_pool_thread	BACKGROUND	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	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..9a7eb5b3eb5
--- /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..52fa3783a8b
--- /dev/null
+++ b/mysql-test/suite/perfschema/r/transaction_nested_events.result
@@ -0,0 +1,1284 @@
+#
+#========================================================================
+# 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	         10	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  9	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	         10	         10	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  9	STATEMENT         
+thread_id	         10	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  9	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/create_procedure	NULL        	               NULL	NULL              	    0	CREATE PROCEDURE tp_update() UPDATE t1 SET s1 = s1 + 1
+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 (310, "INSERT 310")
+thread_id	          6	          6	statement/sql/insert          	NULL        	                  4	TRANSACTION       	    0	INSERT INTO t1 VALUES (311, "INSERT 311")
+thread_id	          7	          7	statement/sql/insert          	NULL        	                  4	TRANSACTION       	    0	INSERT INTO t1 VALUES (312, "INSERT 312")
+thread_id	          8	          8	statement/sql/insert          	NULL        	                  4	TRANSACTION       	    0	INSERT INTO t1 VALUES (313, "INSERT 313")
+thread_id	          9	         11	statement/sql/call_procedure  	NULL        	                  4	TRANSACTION       	    0	CALL tp_update()
+thread_id	         11	         11	statement/sp/stmt             	tp_update   	                  9	STATEMENT         	    1	UPDATE t1 SET s1 = s1 + 1
+thread_id	         12	         12	statement/sql/commit          	NULL        	               NULL	NULL              	    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/create_proc	               NULL	NULL              	CREATE PROCEDURE tp_update() UPDATE t1 SET s1 = s1 + 1
+thread_id	          2	          2	transaction              	                  1	STATEMENT         	<transaction started>
+thread_id	          3	          4	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
+thread_id	          5	          5	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (310, "INSERT 310")
+thread_id	          6	          6	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (311, "INSERT 311")
+thread_id	          7	          7	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (312, "INSERT 312")
+thread_id	          8	          8	statement/sql/insert     	                  4	TRANSACTION       	INSERT INTO t1 VALUES (313, "INSERT 313")
+thread_id	          9	         11	statement/sql/call_proced	                  4	TRANSACTION       	CALL tp_update()
+thread_id	         10	         10	transaction              	                  9	STATEMENT         	<transaction started>
+thread_id	         10	         12	transaction              	                  9	STATEMENT         	<transaction started>
+thread_id	         11	         11	statement/sp/stmt        	                  9	STATEMENT         	UPDATE t1 SET s1 = s1 + 1
+thread_id	         12	         12	statement/sql/commit     	               NULL	NULL              	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	          6	         11	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  5	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	         11	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  5	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/create_procedure	NULL        	               NULL	NULL              	    0	CREATE PROCEDURE tp_start() START TRANSACTION
+thread_id	          3	          6	statement/sql/call_procedure  	NULL        	               NULL	NULL              	    0	CALL tp_start()
+thread_id	          5	          6	statement/sp/stmt             	tp_start    	                  3	STATEMENT         	    1	START TRANSACTION
+thread_id	          7	          7	statement/sql/insert          	NULL        	                  6	TRANSACTION       	    0	INSERT INTO t1 VALUES (320, "INSERT 320"),(321, "INSERT 321")
+thread_id	          8	          8	statement/sql/insert          	NULL        	                  6	TRANSACTION       	    0	INSERT INTO t1 VALUES (322, "INSERT 322"),(323, "INSERT 323")
+thread_id	          9	          9	statement/sql/update          	NULL        	                  6	TRANSACTION       	    0	UPDATE t1 SET s1 = s1 + 1 WHERE s1 > 320
+thread_id	         10	         10	statement/sql/select          	NULL        	                  6	TRANSACTION       	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	         11	         11	statement/sql/commit          	NULL        	                  6	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/create_proc	               NULL	NULL              	CREATE PROCEDURE tp_start() START TRANSACTION
+thread_id	          2	          2	transaction              	                  1	STATEMENT         	<transaction started>
+thread_id	          3	          6	statement/sql/call_proced	               NULL	NULL              	CALL tp_start()
+thread_id	          4	          4	transaction              	                  3	STATEMENT         	<transaction started>
+thread_id	          5	          6	statement/sp/stmt        	                  3	STATEMENT         	START TRANSACTION
+thread_id	          6	         11	transaction              	                  5	STATEMENT         	<transaction started>
+thread_id	          7	          7	statement/sql/insert     	                  6	TRANSACTION       	INSERT INTO t1 VALUES (320, "INSERT 320"),(321, "INSERT 321")
+thread_id	          8	          8	statement/sql/insert     	                  6	TRANSACTION       	INSERT INTO t1 VALUES (322, "INSERT 322"),(323, "INSERT 323")
+thread_id	          9	          9	statement/sql/update     	                  6	TRANSACTION       	UPDATE t1 SET s1 = s1 + 1 WHERE s1 > 320
+thread_id	         10	         10	statement/sql/select     	                  6	TRANSACTION       	SELECT * FROM t1 ORDER BY s1
+thread_id	         11	         11	statement/sql/commit     	                  6	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	         22	         22	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 21	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	         11	         11	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                 10	STATEMENT         
+thread_id	         11	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                 10	STATEMENT         
+thread_id	         14	         14	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 13	STATEMENT         
+thread_id	         19	         19	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                 18	STATEMENT         
+thread_id	         19	         20	transaction	ROLLED BACK	READ WRITE 	REPEATABLE READ 	NO  	                 18	STATEMENT         
+thread_id	         22	         22	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 21	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/create_procedure	NULL        	               NULL	NULL              	    0	CREATE PROCEDURE tp_rollback() ROLLBACK
+thread_id	          3	          4	statement/sql/create_procedure	NULL        	               NULL	NULL              	    0	CREATE PROCEDURE tp_commit() COMMIT
+thread_id	          5	          6	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
+thread_id	          7	          7	statement/sql/insert          	NULL        	                  6	TRANSACTION       	    0	INSERT INTO t1 VALUES (330, "INSERT 330"),(331, "INSERT 331")
+thread_id	          8	          8	statement/sql/insert          	NULL        	                  6	TRANSACTION       	    0	INSERT INTO t1 VALUES (332, "INSERT 332"),(333, "INSERT 333")
+thread_id	          9	          9	statement/sql/delete          	NULL        	                  6	TRANSACTION       	    0	DELETE FROM t1 WHERE s1 > 331
+thread_id	         10	         12	statement/sql/call_procedure  	NULL        	                  6	TRANSACTION       	    0	CALL tp_commit()
+thread_id	         12	         12	statement/sp/stmt             	tp_commit   	                 10	STATEMENT         	    1	COMMIT
+thread_id	         13	         14	statement/sql/select          	NULL        	               NULL	NULL              	    0	SELECT * FROM t1 ORDER BY s1
+thread_id	         15	         16	statement/sql/begin           	NULL        	               NULL	NULL              	    0	START TRANSACTION
+thread_id	         17	         17	statement/sql/update          	NULL        	                 16	TRANSACTION       	    0	UPDATE t1 SET s1 = s1*2 WHERE s1 > 331
+thread_id	         18	         20	statement/sql/call_procedure  	NULL        	                 16	TRANSACTION       	    0	CALL tp_rollback()
+thread_id	         20	         20	statement/sp/stmt             	tp_rollback 	                 18	STATEMENT         	    1	ROLLBACK
+thread_id	         21	         22	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/create_proc	               NULL	NULL              	CREATE PROCEDURE tp_rollback() ROLLBACK
+thread_id	          2	          2	transaction              	                  1	STATEMENT         	<transaction started>
+thread_id	          3	          4	statement/sql/create_proc	               NULL	NULL              	CREATE PROCEDURE tp_commit() COMMIT
+thread_id	          4	          4	transaction              	                  3	STATEMENT         	<transaction started>
+thread_id	          5	          6	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
+thread_id	          7	          7	statement/sql/insert     	                  6	TRANSACTION       	INSERT INTO t1 VALUES (330, "INSERT 330"),(331, "INSERT 331")
+thread_id	          8	          8	statement/sql/insert     	                  6	TRANSACTION       	INSERT INTO t1 VALUES (332, "INSERT 332"),(333, "INSERT 333")
+thread_id	          9	          9	statement/sql/delete     	                  6	TRANSACTION       	DELETE FROM t1 WHERE s1 > 331
+thread_id	         10	         12	statement/sql/call_proced	                  6	TRANSACTION       	CALL tp_commit()
+thread_id	         11	         11	transaction              	                 10	STATEMENT         	<transaction started>
+thread_id	         11	         12	transaction              	                 10	STATEMENT         	<transaction started>
+thread_id	         12	         12	statement/sp/stmt        	                 10	STATEMENT         	COMMIT
+thread_id	         13	         14	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
+thread_id	         14	         14	transaction              	                 13	STATEMENT         	<transaction started>
+thread_id	         15	         16	statement/sql/begin      	               NULL	NULL              	START TRANSACTION
+thread_id	         17	         17	statement/sql/update     	                 16	TRANSACTION       	UPDATE t1 SET s1 = s1*2 WHERE s1 > 331
+thread_id	         18	         20	statement/sql/call_proced	                 16	TRANSACTION       	CALL tp_rollback()
+thread_id	         19	         19	transaction              	                 18	STATEMENT         	<transaction started>
+thread_id	         19	         20	transaction              	                 18	STATEMENT         	<transaction started>
+thread_id	         20	         20	statement/sp/stmt        	                 18	STATEMENT         	ROLLBACK
+thread_id	         21	         22	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
+thread_id	         22	         22	transaction              	                 21	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	         14	         14	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 13	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	          9	          9	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  8	STATEMENT         
+thread_id	          9	         12	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	NO  	                  8	STATEMENT         
+thread_id	         14	         14	transaction	COMMITTED  	READ WRITE 	REPEATABLE READ 	YES 	                 13	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	         11	statement/sql/select          	NULL        	                  2	TRANSACTION       	    0	SELECT fn_add(413, 414)
+thread_id	         10	         10	statement/sp/stmt             	fn_add      	                  8	STATEMENT         	    1	INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y")
+thread_id	         11	         11	statement/sp/freturn          	fn_add      	                  8	STATEMENT         	    1	NULL
+thread_id	         12	         12	statement/sql/commit          	NULL        	               NULL	NULL              	    0	COMMIT
+thread_id	         13	         14	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	          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	         11	statement/sql/select     	                  2	TRANSACTION       	SELECT fn_add(413, 414)
+thread_id	          9	          9	transaction              	                  8	STATEMENT         	<transaction started>
+thread_id	          9	         12	transaction              	                  8	STATEMENT         	<transaction started>
+thread_id	         10	         10	statement/sp/stmt        	                  8	STATEMENT         	INSERT INTO t1 VALUES (x, "INSERT x"),(y, "INSERT y")
+thread_id	         11	         11	statement/sp/freturn     	                  8	STATEMENT         	NULL
+thread_id	         12	         12	statement/sql/commit     	               NULL	NULL              	COMMIT
+thread_id	         13	         14	statement/sql/select     	               NULL	NULL              	SELECT * FROM t1 ORDER BY s1
+thread_id	         14	         14	transaction              	                 13	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 1 transactions
+connection default;
+SELECT COUNT(*) FROM performance_schema.events_transactions_history;
+COUNT(*)
+1
+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 2 transactions
+connection default;
+SELECT COUNT(*) FROM performance_schema.events_transactions_history;
+COUNT(*)
+2
+#
+## 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;
diff --git a/mysql-test/suite/perfschema/t/all_tests.test b/mysql-test/suite/perfschema/t/all_tests.test
index e0db6d459de..b16364ba17f 100644
--- a/mysql-test/suite/perfschema/t/all_tests.test
+++ b/mysql-test/suite/perfschema/t/all_tests.test
@@ -43,10 +43,13 @@ insert into t2 select concat('dml_', table_name, '.test') from information_schem
 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_");
 
 # Debug
 # select test_name as 'FOUND' from t1;
diff --git a/mysql-test/suite/perfschema/t/alter_table_progress.test b/mysql-test/suite/perfschema/t/alter_table_progress.test
new file mode 100644
index 00000000000..d0a4055ad0e
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/alter_table_progress.test
@@ -0,0 +1,145 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_innodb.inc
+--source include/have_perfschema.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
+
+# Presence of the query cache changes query stages,
+# causing noise in the test output
+#--source include/have_query_cache_disabled.inc
+
+# Setup
+
+connect (con1, localhost, root, , );
+
+let $con1_THREAD_ID=`select thread_id from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+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;
+
+--disable_query_log
+eval select $con1_THREAD_ID into @con1_thread_id;
+--enable_query_log
+
+--connection con1
+
+# ALTER TABLE statement to inspect,
+# execution should instrument progress
+
+SET DEBUG_SYNC='RESET';
+SET DEBUG_SYNC='copy_data_between_tables_before SIGNAL found_row WAIT_FOR wait_row EXECUTE 5';
+--send ALTER TABLE t1 engine = innodb;
+
+--connection default
+
+SET DEBUG_SYNC='now WAIT_FOR found_row';
+
+# Find the statement id of the ALTER TABLE
+select event_id from performance_schema.events_statements_current
+  where thread_id = @con1_thread_id into @con1_stmt_id;
+
+# completed 0
+select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
+  from performance_schema.events_stages_current
+  where (thread_id = @con1_thread_id);
+
+SET DEBUG_SYNC='now SIGNAL wait_row';
+
+#======
+
+SET DEBUG_SYNC='now WAIT_FOR found_row';
+
+# completed 1
+select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
+  from performance_schema.events_stages_current
+  where (thread_id = @con1_thread_id);
+
+SET DEBUG_SYNC='now SIGNAL wait_row';
+
+#======
+
+SET DEBUG_SYNC='now WAIT_FOR found_row';
+
+# completed 2
+select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
+  from performance_schema.events_stages_current
+  where (thread_id = @con1_thread_id);
+
+SET DEBUG_SYNC='now SIGNAL wait_row';
+
+#======
+
+SET DEBUG_SYNC='now WAIT_FOR found_row';
+
+# completed 3
+select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
+  from performance_schema.events_stages_current
+  where (thread_id = @con1_thread_id);
+
+SET DEBUG_SYNC='now SIGNAL wait_row';
+
+#======
+
+SET DEBUG_SYNC='now WAIT_FOR found_row';
+
+# completed 4
+select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
+  from performance_schema.events_stages_current
+  where (thread_id = @con1_thread_id);
+
+SET DEBUG_SYNC='now SIGNAL wait_row';
+
+#======
+
+--connection con1
+
+# Complete the ALTER TABLE statement.
+--reap
+
+# Make sure the ALTER TABLE cleanup is executed,
+# as the last stages are after writing back to the client,
+# and done asynchronously from the last 'reap'.
+select "After payload";
+
+--connection default
+
+--echo # Dumping ALTER TABLE stages
+
+# Print all stages for this ALTER TABLE statement
+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;
+
+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/t/bad_option.test b/mysql-test/suite/perfschema/t/bad_option.test
new file mode 100644
index 00000000000..5d4d49ed12c
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/bad_option.test
@@ -0,0 +1,74 @@
+# Tests for PERFORMANCE_SCHEMA
+# Check error handling for invalid server start options and values
+
+# The current test unites and replaces all suite/perfschema/t/bad_option_*.test
+# which were developed by Marc.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+let $error_log= $MYSQLTEST_VARDIR/log/my_restart.err;
+--error 0,1
+--remove_file $error_log
+let SEARCH_FILE= $error_log;
+# Stop the server
+let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+--exec echo "wait" > $restart_file
+--shutdown_server 
+--source include/wait_until_disconnected.inc
+--error 7
+--exec $MYSQLD_CMD --loose-console --skip-log-error --performance-schema-enabled=maybe > $error_log 2>&1
+# The server restart aborts
+# [ERROR] unknown variable 'performance-schema-enabled=maybe'
+let SEARCH_PATTERN= \[ERROR\].*unknown variable 'performance-schema-enabled=maybe';
+--source include/search_pattern_in_file.inc
+--echo # Server start with invalid startup option value 'performance-schema-enabled=maybe' : pass
+
+--remove_file $error_log
+--error 7
+--exec $MYSQLD_CMD --loose-console --skip-log-error --performance-schema-max_=12 > $error_log 2>&1
+# The server restart aborts
+# [ERROR] unknown variable 'performance-schema-max_=12'
+let SEARCH_PATTERN= \[ERROR\].*unknown variable 'performance-schema-max_=12';
+--source include/search_pattern_in_file.inc
+--echo # Server start with ambigous startup option 'performance-schema-max_=12' : pass
+# The important points is here:
+# 1. There is no option 'performance-schema-max_' or 'performance-schema-max-' at all.
+# 2. But we have many options where the name starts exact with this pattern.
+# 3. There is a value assigned.
+# 4. The server criticizes "variable" and not "option"!
+#    This seems to be caused by 3. because "--performance-schema-unknown=ON" gets
+#    a similar reaction.
+
+--remove_file $error_log
+--error 2
+--exec $MYSQLD_CMD --loose-console --skip-log-error --performance-schema-unknown_99 > $error_log 2>&1
+# The server restart aborts
+let SEARCH_PATTERN= \[ERROR\].*unknown option '--performance-schema-unknown_99';
+--source include/search_pattern_in_file.inc
+--echo # Server start with invalid startup option '--performance-schema-unknown_99' : pass
+
+--remove_file $error_log
+--error 1
+--exec $MYSQLD_CMD --loose-console --skip-log-error --datadir=bad_option_h_param > $error_log 2>&1
+# The server restart aborts
+# [ERROR] failed to set datadir to /work/repo1/mysql-trunk2/bad_option_h_param
+let SEARCH_PATTERN= Can.t change dir to .*bad_option_h_param;
+--source include/search_pattern_in_file.inc
+--echo # Server start with invalid startup option value '--datadir=bad_option_h_param' : pass
+# The important point is here:
+# There is no directory "bad_option_h_param".
+
+--remove_file $error_log
+# Write file to make mysql-test-run.pl start up the server again
+--exec echo "restart" > $restart_file
+
+# Turn on reconnect
+--enable_reconnect
+
+# Call script that will poll the server waiting for it to be back online again
+--source include/wait_until_connected_again.inc
+
+# Turn off reconnect again
+--disable_reconnect
+
diff --git a/mysql-test/suite/perfschema/t/bad_option_1.test b/mysql-test/suite/perfschema/t/bad_option_1.test
deleted file mode 100644
index bba0d6d5357..00000000000
--- a/mysql-test/suite/perfschema/t/bad_option_1.test
+++ /dev/null
@@ -1,39 +0,0 @@
-# Tests for PERFORMANCE_SCHEMA
-# Check error handling for invalid server start options
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
-
---source include/kill_mysqld.inc
-
-let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_1.txt;
---disable_warnings
---error 0,1
---remove_file $outfile
---enable_warnings
---error 7
---exec $MYSQLD_BOOTSTRAP_CMD --loose-console --performance-schema-enabled=maybe > $outfile 2>&1
-
-perl;
-    use strict;
-    use warnings;
-    my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/bad_option_1.txt";
-    open(FILE, "<", $fname) or die;
-    my @lines= <FILE>;
-    # those must be in the file for the test to pass
-    my @patterns=
-      ("unknown variable 'performance-schema-enabled=maybe'",
-       "Aborting");
-    foreach my $one_line (@lines)
-    {
-      foreach my $one_pattern (@patterns)
-      {
-        # print pattern, not line, to get a stable output
-        print "Found: $one_pattern\n" if ($one_line =~ /$one_pattern/);
-      }
-    }
-    close FILE;
-EOF
---remove_file $outfile
-
---source include/start_mysqld.inc
diff --git a/mysql-test/suite/perfschema/t/bad_option_2.test b/mysql-test/suite/perfschema/t/bad_option_2.test
deleted file mode 100644
index d6c2b905167..00000000000
--- a/mysql-test/suite/perfschema/t/bad_option_2.test
+++ /dev/null
@@ -1,21 +0,0 @@
-# Tests for PERFORMANCE_SCHEMA
-# Check error handling for ambiguous server start options
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
-
---source include/kill_mysqld.inc
-
-let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_2.txt;
---disable_warnings
---error 0,1
---remove_file $outfile
---enable_warnings
---error 3
---exec $MYSQLD_BOOTSTRAP_CMD --loose-console --enable-getopt-prefix-matching --performance-schema-max_=12 > $outfile 2>&1
---let SEARCH_PATTERN=ambiguous option '--performance-schema-max_=12'
---let SEARCH_FILE=$outfile
---source include/search_pattern_in_file.inc
---remove_file $outfile
-
---source include/start_mysqld.inc
diff --git a/mysql-test/suite/perfschema/t/bad_option_3.test b/mysql-test/suite/perfschema/t/bad_option_3.test
deleted file mode 100644
index a4efcbccd74..00000000000
--- a/mysql-test/suite/perfschema/t/bad_option_3.test
+++ /dev/null
@@ -1,39 +0,0 @@
-# Tests for PERFORMANCE_SCHEMA
-# Check error handling for invalid server start options
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
-
---source include/kill_mysqld.inc
-
-let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_3.txt;
---disable_warnings
---error 0,1
---remove_file $outfile
---enable_warnings
---error 2
---exec $MYSQLD_BOOTSTRAP_CMD --loose-console -a -x > $outfile 2>&1
-
-perl;
-    use strict;
-    use warnings;
-    my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/bad_option_3.txt";
-    open(FILE, "<", $fname) or die;
-    my @lines= <FILE>;
-    # those must be in the file for the test to pass
-    my @patterns=
-      ("unknown option '-x'",
-       "Aborting");
-    foreach my $one_line (@lines)
-    {
-      foreach my $one_pattern (@patterns)
-      {
-        # print pattern, not line, to get a stable output
-        print "Found: $one_pattern\n" if ($one_line =~ /$one_pattern/);
-      }
-    }
-    close FILE;
-EOF
---remove_file $outfile
-
---source include/start_mysqld.inc
diff --git a/mysql-test/suite/perfschema/t/bad_option_4.test b/mysql-test/suite/perfschema/t/bad_option_4.test
deleted file mode 100644
index ee8705788bc..00000000000
--- a/mysql-test/suite/perfschema/t/bad_option_4.test
+++ /dev/null
@@ -1,39 +0,0 @@
-# Tests for PERFORMANCE_SCHEMA
-# Check error handling for invalid server start options
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
-
---source include/kill_mysqld.inc
-
-let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_4.txt;
---disable_warnings
---error 0,1
---remove_file $outfile
---enable_warnings
---error 1
---exec $MYSQLD_BOOTSTRAP_CMD --loose-console -a -h bad_option_h_param > $outfile 2>&1
-
-perl;
-    use strict;
-    use warnings;
-    my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/bad_option_4.txt";
-    open(FILE, "<", $fname) or die;
-    my @lines= <FILE>;
-    # those must be in the file for the test to pass
-    my @patterns=
-      ("Can't change dir to.*bad_option_h_param",
-       "Aborting");
-    foreach my $one_line (@lines)
-    {
-      foreach my $one_pattern (@patterns)
-      {
-        # print pattern, not line, to get a stable output
-        print "Found: $one_pattern\n" if ($one_line =~ /$one_pattern/);
-      }
-    }
-    close FILE;
-EOF
---remove_file $outfile
-
---source include/start_mysqld.inc
diff --git a/mysql-test/suite/perfschema/t/bad_option_5.test b/mysql-test/suite/perfschema/t/bad_option_5.test
deleted file mode 100644
index c9c6fc75d52..00000000000
--- a/mysql-test/suite/perfschema/t/bad_option_5.test
+++ /dev/null
@@ -1,42 +0,0 @@
-# Tests for PERFORMANCE_SCHEMA
-# Check error handling for invalid server start options
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
-
---source include/kill_mysqld.inc
-
-let $outfile= $MYSQLTEST_VARDIR/tmp/bad_option_5.txt;
---disable_warnings
---error 0,1
---remove_file $outfile
---enable_warnings
---error 2
---exec $MYSQLD_BOOTSTRAP_CMD --loose-console -aXbroken > $outfile 2>&1
-
-# -aXbroken should be parsed as -a -Xbroken, or --ansi -Xbroken,
-# therefore the -X option is what the server should complain about
-
-perl;
-    use strict;
-    use warnings;
-    my $fname= "$ENV{'MYSQLTEST_VARDIR'}/tmp/bad_option_5.txt";
-    open(FILE, "<", $fname) or die;
-    my @lines= <FILE>;
-    # those must be in the file for the test to pass
-    my @patterns=
-      ("unknown option '-X'",
-       "Aborting");
-    foreach my $one_line (@lines)
-    {
-      foreach my $one_pattern (@patterns)
-      {
-        # print pattern, not line, to get a stable output
-        print "Found: $one_pattern\n" if ($one_line =~ /$one_pattern/);
-      }
-    }
-    close FILE;
-EOF
---remove_file $outfile
-
---source include/start_mysqld.inc
diff --git a/mysql-test/suite/perfschema/t/batch_table_io_func.test b/mysql-test/suite/perfschema/t/batch_table_io_func.test
new file mode 100644
index 00000000000..c35d8a06125
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/batch_table_io_func.test
@@ -0,0 +1,148 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+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');
+
+--disable_warnings
+drop procedure if exists before_payload;
+drop procedure if exists after_payload;
+--enable_warnings
+
+delimiter $$;
+
+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
+$$
+
+delimiter ;$$
+
+
+--disable_warnings
+drop table if exists t1;
+drop table if exists t2;
+drop table if exists t3;
+--enable_warnings
+
+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;
+analyze table t2;
+analyze table t3;
+
+select * from t1 order by a;
+
+# Only dump a small part
+select * from t2
+  where (b >= 180) and (b <= 220)
+  order by b;
+
+# Only dump a small part
+select * from t3
+  where (c >= 587) and (c <= 612)
+  order by c;
+
+#
+# TEST 1 (join, no index)
+#
+
+explain extended select t1.*, t2.*, t3.*
+  from t1 join t2 using (id1) join t3 using (id2);
+
+call before_payload();
+
+# Payload query to analyse: should do batch io on t3
+
+--disable_result_log
+select t1.*, t2.*, t3.*
+  from t1 join t2 using (id1) join t3 using (id2);
+--enable_result_log
+
+call after_payload();
+
+#
+# TEST 2 (join, with index)
+#
+
+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);
+
+call before_payload();
+
+# Payload query to analyse: should do batch io on t3
+
+--disable_result_log
+select t1.*, t2.*, t3.*
+  from t1 join t2 using (id1) join t3 using (id2);
+--enable_result_log
+
+call after_payload();
+
+# Cleanup
+
+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/t/checksum.test b/mysql-test/suite/perfschema/t/checksum.test
index 125573242cc..a2d43b27bce 100644
--- a/mysql-test/suite/perfschema/t/checksum.test
+++ b/mysql-test/suite/perfschema/t/checksum.test
@@ -27,6 +27,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;
@@ -73,6 +81,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/t/cnf_option.test b/mysql-test/suite/perfschema/t/cnf_option.test
index 698bb44b104..04140310cf4 100644
--- a/mysql-test/suite/perfschema/t/cnf_option.test
+++ b/mysql-test/suite/perfschema/t/cnf_option.test
@@ -4,6 +4,6 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 
-show variables like 'performance_schema_max_thread_classes';
-show variables like 'performance_schema_max_thread_instances';
+show global variables like 'performance_schema_max_thread_classes';
+show global variables like 'performance_schema_max_thread_instances';
 
diff --git a/mysql-test/suite/perfschema/t/connect_attrs.test b/mysql-test/suite/perfschema/t/connect_attrs.test
index 850d9ddd248..c703badef85 100644
--- a/mysql-test/suite/perfschema/t/connect_attrs.test
+++ b/mysql-test/suite/perfschema/t/connect_attrs.test
@@ -57,7 +57,7 @@ SELECT COUNT(DISTINCT PROCESSLIST_ID)
   FROM performance_schema.session_connect_attrs;
 
 connection non_privileged_user;
---error ER_TABLEACCESS_DENIED_ERROR
+--echo # must return 1
 SELECT COUNT(DISTINCT PROCESSLIST_ID)
   FROM performance_schema.session_account_connect_attrs;
 
diff --git a/mysql-test/suite/perfschema/t/connection_type_notwin.test b/mysql-test/suite/perfschema/t/connection_type_notwin.test
new file mode 100644
index 00000000000..07028e1fb81
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/connection_type_notwin.test
@@ -0,0 +1,92 @@
+
+--source include/not_windows.inc
+--source include/not_embedded.inc
+--source include/have_debug.inc
+--source include/have_perfschema.inc
+
+--echo # Default connection
+
+--vertical_results
+select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
+  from performance_schema.threads
+  where PROCESSLIST_ID = connection_id();
+
+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";
+
+# Setup
+# make sure we start with a clean slate. log_tables.test says this is OK.
+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;
+
+--replace_result $MYSQLTEST_VARDIR ...
+eval SET GLOBAL general_log_file = '$MYSQLTEST_VARDIR/log/rewrite_general_con.log';
+SET GLOBAL log_output =       'FILE,TABLE';
+SET GLOBAL general_log=       'ON';
+
+connect(con1, localhost, root,,);
+
+select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
+  from performance_schema.threads
+  where PROCESSLIST_ID = connection_id();
+
+--disconnect con1
+
+connect(con2, "127.0.0.1", root,,test,$MASTER_MYPORT,);
+
+select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
+  from performance_schema.threads
+  where PROCESSLIST_ID = connection_id();
+
+--disconnect con2
+
+connect(con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL);
+
+select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
+  from performance_schema.threads
+  where PROCESSLIST_ID = connection_id();
+
+--disconnect con3
+
+--connection default
+
+SET GLOBAL general_log=       'OFF';
+
+# show general-logging to file is correct
+CREATE TABLE test_log (argument TEXT);
+--replace_result $MYSQLTEST_VARDIR ...
+eval LOAD DATA LOCAL INFILE '$MYSQLTEST_VARDIR/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";
+
+select substring(argument, locate("Connect", argument)) from test_log
+  where argument like "%Connect%on test%";
+
+
+DROP TABLE test_log;
+
+--remove_file $MYSQLTEST_VARDIR/log/rewrite_general_con.log
+
+SET GLOBAL general_log_file=  @old_general_log_file;
+SET GLOBAL general_log=       @old_general_log;
+SET GLOBAL log_output=        @old_log_output;
+
+--horizontal_results
+
+set global debug_dbug= @old_dbug;
+revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
+drop user 'root'@'santa.claus.ipv4.example.com';
+revoke select on *.* from 'rootssl'@'santa.claus.ipv4.example.com';
+drop user 'rootssl'@'santa.claus.ipv4.example.com';
+
diff --git a/mysql-test/suite/perfschema/t/connection_type_win.test b/mysql-test/suite/perfschema/t/connection_type_win.test
new file mode 100644
index 00000000000..2beccdbc5e5
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/connection_type_win.test
@@ -0,0 +1,90 @@
+
+--source include/windows.inc
+--source include/not_embedded.inc
+--source include/have_debug.inc
+--source include/have_perfschema.inc
+
+--echo # Default connection
+
+--vertical_results
+select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
+  from performance_schema.threads
+  where PROCESSLIST_ID = connection_id();
+
+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";
+
+# Setup
+# make sure we start with a clean slate. log_tables.test says this is OK.
+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;
+
+--replace_result $MYSQLTEST_VARDIR ...
+eval SET GLOBAL general_log_file = '$MYSQLTEST_VARDIR/log/rewrite_general_con.log';
+SET GLOBAL log_output =       'FILE,TABLE';
+SET GLOBAL general_log=       'ON';
+
+connect(con1, localhost, root,,);
+
+select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
+  from performance_schema.threads
+  where PROCESSLIST_ID = connection_id();
+
+--disconnect con1
+
+connect(con2, "127.0.0.1", root,,test,$MASTER_MYPORT,);
+
+select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
+  from performance_schema.threads
+  where PROCESSLIST_ID = connection_id();
+
+--disconnect con2
+
+connect(con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL);
+
+select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
+  from performance_schema.threads
+  where PROCESSLIST_ID = connection_id();
+
+--disconnect con3
+
+--connection default
+
+SET GLOBAL general_log=       'OFF';
+
+# show general-logging to file is correct
+CREATE TABLE test_log (argument TEXT);
+--replace_result $MYSQLTEST_VARDIR ...
+eval LOAD DATA LOCAL INFILE '$MYSQLTEST_VARDIR/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";
+
+select substring(argument, locate("Connect", argument)) from test_log
+  where argument like "%Connect%on test%";
+
+
+DROP TABLE test_log;
+
+--remove_file $MYSQLTEST_VARDIR/log/rewrite_general_con.log
+
+SET GLOBAL general_log_file=  @old_general_log_file;
+SET GLOBAL general_log=       @old_general_log;
+SET GLOBAL log_output=        @old_log_output;
+
+--horizontal_results
+
+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/t/ddl_esms_by_program.test b/mysql-test/suite/perfschema/t/ddl_esms_by_program.test
new file mode 100644
index 00000000000..ba24da5e4ba
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_esms_by_program.test
@@ -0,0 +1,21 @@
+# This line and the line below is a temporary line for tests that do not need MyISAM in future, but need to be kept for tests that need it.
+#--source include/have_myisam.inc
+
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.events_statements_summary_by_program
+  add column foo integer;
+
+truncate table performance_schema.events_statements_summary_by_program;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.events_statements_summary_by_program ADD INDEX test_index(OBJECT_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.events_statements_summary_by_program(OBJECT_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_ets_by_account_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_ets_by_account_by_event_name.test
new file mode 100644
index 00000000000..2ec1ddf79b3
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_ets_by_account_by_event_name.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.events_transactions_summary_by_account_by_event_name
+  add column foo integer;
+
+truncate table performance_schema.events_transactions_summary_by_account_by_event_name;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.events_transactions_summary_by_account_by_event_name
+  ADD INDEX test_index(USERNAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.events_transactions_summary_by_account_by_event_name(USERNAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_ets_by_host_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_ets_by_host_by_event_name.test
new file mode 100644
index 00000000000..47ae1d197f5
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_ets_by_host_by_event_name.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.events_transactions_summary_by_host_by_event_name
+  add column foo integer;
+
+truncate table performance_schema.events_transactions_summary_by_host_by_event_name;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.events_transactions_summary_by_host_by_event_name
+  ADD INDEX test_index(HOSTNAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.events_transactions_summary_by_host_by_event_name(HOSTNAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_ets_by_thread_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_ets_by_thread_by_event_name.test
new file mode 100644
index 00000000000..63cdfd898f3
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_ets_by_thread_by_event_name.test
@@ -0,0 +1,18 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.events_transactions_summary_by_thread_by_event_name
+  add column foo integer;
+
+truncate table performance_schema.events_transactions_summary_by_thread_by_event_name;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.events_transactions_summary_by_thread_by_event_name ADD INDEX test_index(THREAD_ID);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.events_transactions_summary_by_thread_by_event_name(THREAD_ID);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_ets_by_user_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_ets_by_user_by_event_name.test
new file mode 100644
index 00000000000..9a70075b653
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_ets_by_user_by_event_name.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.events_transactions_summary_by_user_by_event_name
+  add column foo integer;
+
+truncate table performance_schema.events_transactions_summary_by_user_by_event_name;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.events_transactions_summary_by_user_by_event_name
+  ADD INDEX test_index(USERNAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.events_transactions_summary_by_user_by_event_name(USERNAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_ets_global_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_ets_global_by_event_name.test
new file mode 100644
index 00000000000..5bb70245bd4
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_ets_global_by_event_name.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.events_transactions_summary_global_by_event_name
+  add column foo integer;
+
+truncate table performance_schema.events_transactions_summary_global_by_event_name;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.events_transactions_summary_global_by_event_name
+  ADD INDEX test_index(EVENT_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.events_transactions_summary_global_by_event_name(EVENT_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_events_stages_current.test b/mysql-test/suite/perfschema/t/ddl_events_stages_current.test
index 6085e41a7fd..822600ce6d4 100644
--- a/mysql-test/suite/perfschema/t/ddl_events_stages_current.test
+++ b/mysql-test/suite/perfschema/t/ddl_events_stages_current.test
@@ -14,3 +14,8 @@ ALTER TABLE performance_schema.events_stages_current ADD INDEX test_index(EVENT_
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_current(EVENT_ID);
 
+--disable_query_log
+# Checking if the column WORK_COMPLETED and WORK_ESTIMATED exists
+select * from information_schema.columns where TABLE_NAME = 'events_stages_current' and column_name in ('WORK_COMPLETED','WORK_ESTIMATED')
+and table_schema='performance_schema';
+--enable_query_log
diff --git a/mysql-test/suite/perfschema/t/ddl_events_stages_history.test b/mysql-test/suite/perfschema/t/ddl_events_stages_history.test
index 1dd186571b2..eac2889e7cb 100644
--- a/mysql-test/suite/perfschema/t/ddl_events_stages_history.test
+++ b/mysql-test/suite/perfschema/t/ddl_events_stages_history.test
@@ -14,3 +14,8 @@ ALTER TABLE performance_schema.events_stages_history ADD INDEX test_index(EVENT_
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_history(EVENT_ID);
 
+--disable_query_log
+# Checking if the column WORK_COMPLETED and WORK_ESTIMATED exists
+select * from information_schema.columns where TABLE_NAME ='events_stages_history' and column_name in ('WORK_COMPLETED','WORK_ESTIMATED')
+and table_schema='performance_schema';
+--enable_query_log
diff --git a/mysql-test/suite/perfschema/t/ddl_events_stages_history_long.test b/mysql-test/suite/perfschema/t/ddl_events_stages_history_long.test
index 8298500cf6d..2bc78b12674 100644
--- a/mysql-test/suite/perfschema/t/ddl_events_stages_history_long.test
+++ b/mysql-test/suite/perfschema/t/ddl_events_stages_history_long.test
@@ -14,3 +14,8 @@ ALTER TABLE performance_schema.events_stages_history_long ADD INDEX test_index(E
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_history_long(EVENT_ID);
 
+--disable_query_log
+# Checking if the column WORK_COMPLETED and WORK_ESTIMATED exists
+select * from information_schema.columns where TABLE_NAME ='events_stages_history_long' and column_name in ('WORK_COMPLETED','WORK_ESTIMATED')
+and table_schema='performance_schema';
+--enable_query_log
diff --git a/mysql-test/suite/perfschema/t/ddl_events_transactions_current.test b/mysql-test/suite/perfschema/t/ddl_events_transactions_current.test
new file mode 100644
index 00000000000..5f64e65cd1e
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_events_transactions_current.test
@@ -0,0 +1,16 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.events_transactions_current add column foo integer;
+
+truncate table performance_schema.events_transactions_current;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.events_transactions_current ADD INDEX test_index(EVENT_ID);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON performance_schema.events_transactions_current(EVENT_ID);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_events_transactions_history.test b/mysql-test/suite/perfschema/t/ddl_events_transactions_history.test
new file mode 100644
index 00000000000..a3b0cdded5e
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_events_transactions_history.test
@@ -0,0 +1,16 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.events_transactions_history add column foo integer;
+
+truncate table performance_schema.events_transactions_history;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.events_transactions_history ADD INDEX test_index(EVENT_ID);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON performance_schema.events_transactions_history(EVENT_ID);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_events_transactions_history_long.test b/mysql-test/suite/perfschema/t/ddl_events_transactions_history_long.test
new file mode 100644
index 00000000000..1c8d6076f9f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_events_transactions_history_long.test
@@ -0,0 +1,16 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.events_transactions_history_long add column foo integer;
+
+truncate table performance_schema.events_transactions_history_long;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.events_transactions_history_long ADD INDEX test_index(EVENT_ID);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON performance_schema.events_transactions_history_long(EVENT_ID);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_global_status.test b/mysql-test/suite/perfschema/t/ddl_global_status.test
new file mode 100644
index 00000000000..fe65b79ab11
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_global_status.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.global_status
+  add column foo integer;
+
+truncate table performance_schema.global_status;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.global_status
+  ADD INDEX test_index(VARIABLE_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.global_status(VARIABLE_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_global_variables.test b/mysql-test/suite/perfschema/t/ddl_global_variables.test
new file mode 100644
index 00000000000..f9b66a7d41c
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_global_variables.test
@@ -0,0 +1,20 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.global_variables
+  add column foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+truncate table performance_schema.global_variables;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.global_variables
+  ADD INDEX test_index(VARIABLE_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.global_variables(VARIABLE_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_mems_by_account_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_mems_by_account_by_event_name.test
new file mode 100644
index 00000000000..34d08cfe05c
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_mems_by_account_by_event_name.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.memory_summary_by_account_by_event_name
+  add column foo integer;
+
+truncate table performance_schema.memory_summary_by_account_by_event_name;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.memory_summary_by_account_by_event_name
+  ADD INDEX test_index(USERNAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.memory_summary_by_account_by_event_name(USERNAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_mems_by_host_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_mems_by_host_by_event_name.test
new file mode 100644
index 00000000000..fc2e8c054e4
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_mems_by_host_by_event_name.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.memory_summary_by_host_by_event_name
+  add column foo integer;
+
+truncate table performance_schema.memory_summary_by_host_by_event_name;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.memory_summary_by_host_by_event_name
+  ADD INDEX test_index(USERNAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.memory_summary_by_host_by_event_name(USERNAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_mems_by_thread_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_mems_by_thread_by_event_name.test
new file mode 100644
index 00000000000..d4fdf155710
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_mems_by_thread_by_event_name.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.memory_summary_by_thread_by_event_name
+  add column foo integer;
+
+truncate table performance_schema.memory_summary_by_thread_by_event_name;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.memory_summary_by_thread_by_event_name
+  ADD INDEX test_index(USERNAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.memory_summary_by_thread_by_event_name(USERNAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_mems_by_user_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_mems_by_user_by_event_name.test
new file mode 100644
index 00000000000..03e5cebe6a2
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_mems_by_user_by_event_name.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.memory_summary_by_user_by_event_name
+  add column foo integer;
+
+truncate table performance_schema.memory_summary_by_user_by_event_name;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.memory_summary_by_user_by_event_name
+  ADD INDEX test_index(USERNAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.memory_summary_by_user_by_event_name(USERNAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_mems_global_by_event_name.test b/mysql-test/suite/perfschema/t/ddl_mems_global_by_event_name.test
new file mode 100644
index 00000000000..a2c48997877
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_mems_global_by_event_name.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.memory_summary_global_by_event_name
+  add column foo integer;
+
+truncate table performance_schema.memory_summary_global_by_event_name;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.memory_summary_global_by_event_name
+  ADD INDEX test_index(USERNAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.memory_summary_global_by_event_name(USERNAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_metadata_locks.test b/mysql-test/suite/perfschema/t/ddl_metadata_locks.test
new file mode 100644
index 00000000000..520b8fcd3fb
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_metadata_locks.test
@@ -0,0 +1,17 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.metadata_locks add column foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+truncate table performance_schema.metadata_locks;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.metadata_locks ADD INDEX test_index(TIMER_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON performance_schema.metadata_locks(TIMER_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test b/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test
new file mode 100644
index 00000000000..0cba4c485a5
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_prepared_statements_instances.test
@@ -0,0 +1,21 @@
+# This line and the line below is a temporary line for tests that do not need MyISAM in future, but need to be kept for tests that need it.
+#--source include/have_myisam.inc
+
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.prepared_statements_instances
+  add column foo integer;
+
+truncate table performance_schema.prepared_statements_instances;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.prepared_statements_instances ADD INDEX test_index(OWNER_OBJECT_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.prepared_statements_instances(OWNER_OBJECT_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_replication_applier_configuration.test b/mysql-test/suite/perfschema/t/ddl_replication_applier_configuration.test
new file mode 100644
index 00000000000..bc7ef8c28ab
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_replication_applier_configuration.test
@@ -0,0 +1,22 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DDLs on the table replication_applier_configuration
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_applier_configuration
+  ADD COLUMN foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+TRUNCATE TABLE performance_schema.replication_applier_configuration;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_applier_configuration
+   ADD INDEX test_index(desired_delay);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON
+  performance_schema.replication_applier_configuration(desired_delay);
diff --git a/mysql-test/suite/perfschema/t/ddl_replication_applier_status.test b/mysql-test/suite/perfschema/t/ddl_replication_applier_status.test
new file mode 100644
index 00000000000..7cf1f656cd5
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_replication_applier_status.test
@@ -0,0 +1,22 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DDLs on the table replication_applier_status
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_applier_status
+  ADD COLUMN foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+TRUNCATE TABLE performance_schema.replication_applier_status;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_applier_status
+  ADD INDEX test_index(remaining_delay);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON
+  performance_schema.replication_applier_status(remaining_delay);
diff --git a/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_coordinator.test b/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_coordinator.test
new file mode 100644
index 00000000000..0e5f172e2b6
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_coordinator.test
@@ -0,0 +1,22 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DDLs on the table replication_applier_status_by_coordinator
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_applier_status_by_coordinator
+  ADD COLUMN foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+TRUNCATE TABLE performance_schema.replication_applier_status_by_coordinator;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_applier_status_by_coordinator
+  ADD INDEX test_index(thread_id);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON
+  performance_schema.replication_applier_status_by_coordinator(thread_id);
diff --git a/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_worker.test b/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_worker.test
new file mode 100644
index 00000000000..c5adf4ea5c5
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_replication_applier_status_by_worker.test
@@ -0,0 +1,22 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DDLs on the table replication_applier_status_by_worker.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_applier_status_by_worker
+  add column foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+TRUNCATE TABLE performance_schema.replication_applier_status_by_worker;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_applier_status_by_worker
+  ADD INDEX test_index(worker_id);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON
+  performance_schema.replication_applier_status_by_worker(worker_id);
diff --git a/mysql-test/suite/perfschema/t/ddl_replication_connection_configuration.test b/mysql-test/suite/perfschema/t/ddl_replication_connection_configuration.test
new file mode 100644
index 00000000000..4d1dd2ddc75
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_replication_connection_configuration.test
@@ -0,0 +1,22 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DDLs on the table replication_connection_configuration.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_connection_configuration
+  ADD COLUMN foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+TRUNCATE TABLE performance_schema.replication_connection_configuration;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_connection_configuration
+  ADD INDEX test_index(HOST);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.replication_connection_configuration(HOST);
diff --git a/mysql-test/suite/perfschema/t/ddl_replication_connection_status.test b/mysql-test/suite/perfschema/t/ddl_replication_connection_status.test
new file mode 100644
index 00000000000..4420a0dfbd4
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_replication_connection_status.test
@@ -0,0 +1,22 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DDLs on the table replication_connection_status.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_connection_status
+  ADD COLUMN foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+TRUNCATE TABLE performance_schema.replication_connection_status;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_connection_status
+  ADD INDEX test_index(Thread_Id);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.replication_connection_status(Thread_Id);
diff --git a/mysql-test/suite/perfschema/t/ddl_replication_group_member_stats.test b/mysql-test/suite/perfschema/t/ddl_replication_group_member_stats.test
new file mode 100644
index 00000000000..eae5ed1281a
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_replication_group_member_stats.test
@@ -0,0 +1,21 @@
+# Tests for PERFORMANCE_SCHEMA
+# This test verifies the correct behaviour in case of invalid
+# Usage of DDLs on the table replication_group_member_stats.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_group_member_stats
+  ADD COLUMN foo INTEGER;
+
+--error ER_WRONG_PERFSCHEMA_USAGE
+TRUNCATE TABLE performance_schema.replication_group_member_stats;
+
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_group_member_stats
+  ADD INDEX test_index(Member_Id);
+
+--error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.replication_group_member_stats(Member_Id);
diff --git a/mysql-test/suite/perfschema/t/ddl_replication_group_members.test b/mysql-test/suite/perfschema/t/ddl_replication_group_members.test
new file mode 100644
index 00000000000..bcb2c962a50
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_replication_group_members.test
@@ -0,0 +1,22 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DDLs on the table replication_group_members.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_group_members
+  ADD COLUMN foo INTEGER;
+
+--error ER_WRONG_PERFSCHEMA_USAGE
+TRUNCATE TABLE performance_schema.replication_group_members;
+
+--error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.replication_group_members
+  ADD INDEX test_index(Member_Id);
+
+--error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.replication_group_members(Member_Id);
diff --git a/mysql-test/suite/perfschema/t/ddl_session_status.test b/mysql-test/suite/perfschema/t/ddl_session_status.test
new file mode 100644
index 00000000000..5dfa74a0d36
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_session_status.test
@@ -0,0 +1,20 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.session_status
+  add column foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+truncate table performance_schema.session_status;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.session_status
+  ADD INDEX test_index(VARIABLE_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.session_status(VARIABLE_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_session_variables.test b/mysql-test/suite/perfschema/t/ddl_session_variables.test
new file mode 100644
index 00000000000..a649d2bc921
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_session_variables.test
@@ -0,0 +1,20 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.session_variables
+  add column foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+truncate table performance_schema.session_variables;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.session_variables
+  ADD INDEX test_index(VARIABLE_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.session_variables(VARIABLE_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_setup_actors.test b/mysql-test/suite/perfschema/t/ddl_setup_actors.test
index 836fe559d77..73e2c988939 100644
--- a/mysql-test/suite/perfschema/t/ddl_setup_actors.test
+++ b/mysql-test/suite/perfschema/t/ddl_setup_actors.test
@@ -27,3 +27,5 @@ ALTER TABLE performance_schema.setup_actors ADD INDEX test_index(HOST);
 -- error ER_DBACCESS_DENIED_ERROR
 CREATE UNIQUE INDEX test_index ON performance_schema.setup_actors(HOST);
 
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.setup_actors ADD KEY ENA(ENABLED);
diff --git a/mysql-test/suite/perfschema/t/ddl_status_by_account.test b/mysql-test/suite/perfschema/t/ddl_status_by_account.test
new file mode 100644
index 00000000000..52f5d72f04d
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_status_by_account.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.status_by_account
+  add column foo integer;
+
+truncate table performance_schema.status_by_account;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.status_by_account
+  ADD INDEX test_index(VARIABLE_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.status_by_account(VARIABLE_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_status_by_host.test b/mysql-test/suite/perfschema/t/ddl_status_by_host.test
new file mode 100644
index 00000000000..418880d5c34
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_status_by_host.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.status_by_host
+  add column foo integer;
+
+truncate table performance_schema.status_by_host;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.status_by_host
+  ADD INDEX test_index(VARIABLE_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.status_by_host(VARIABLE_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_status_by_thread.test b/mysql-test/suite/perfschema/t/ddl_status_by_thread.test
new file mode 100644
index 00000000000..8ac778a20ae
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_status_by_thread.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.status_by_thread
+  add column foo integer;
+
+truncate table performance_schema.status_by_thread;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.status_by_thread
+  ADD INDEX test_index(VARIABLE_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.status_by_thread(VARIABLE_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_status_by_user.test b/mysql-test/suite/perfschema/t/ddl_status_by_user.test
new file mode 100644
index 00000000000..b0d97aebc6b
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_status_by_user.test
@@ -0,0 +1,19 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.status_by_user
+  add column foo integer;
+
+truncate table performance_schema.status_by_user;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.status_by_user
+  ADD INDEX test_index(VARIABLE_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.status_by_user(VARIABLE_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_table_handles.test b/mysql-test/suite/perfschema/t/ddl_table_handles.test
new file mode 100644
index 00000000000..15ef69f34e0
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_table_handles.test
@@ -0,0 +1,17 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.table_handles add column foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+truncate table performance_schema.table_handles;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.table_handles ADD INDEX test_index(TIMER_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index ON performance_schema.table_handles(TIMER_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_uvar_by_thread.test b/mysql-test/suite/perfschema/t/ddl_uvar_by_thread.test
new file mode 100644
index 00000000000..d8ccda59872
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_uvar_by_thread.test
@@ -0,0 +1,20 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.user_variables_by_thread
+  add column foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+truncate table performance_schema.user_variables_by_thread;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.user_variables_by_thread
+  ADD INDEX test_index(VARIABLE_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.user_variables_by_thread(VARIABLE_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/ddl_variables_by_thread.test b/mysql-test/suite/perfschema/t/ddl_variables_by_thread.test
new file mode 100644
index 00000000000..e5d04f09695
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/ddl_variables_by_thread.test
@@ -0,0 +1,20 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+-- error ER_DBACCESS_DENIED_ERROR
+alter table performance_schema.variables_by_thread
+  add column foo integer;
+
+-- error ER_WRONG_PERFSCHEMA_USAGE
+truncate table performance_schema.variables_by_thread;
+
+-- error ER_DBACCESS_DENIED_ERROR
+ALTER TABLE performance_schema.variables_by_thread
+  ADD INDEX test_index(VARIABLE_NAME);
+
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE UNIQUE INDEX test_index
+  ON performance_schema.variables_by_thread(VARIABLE_NAME);
+
diff --git a/mysql-test/suite/perfschema/t/digest_table_full.test b/mysql-test/suite/perfschema/t/digest_table_full.test
index dbbce662256..605ea1f31ab 100644
--- a/mysql-test/suite/perfschema/t/digest_table_full.test
+++ b/mysql-test/suite/perfschema/t/digest_table_full.test
@@ -24,7 +24,7 @@ SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 
 
 # Expect no digest
-SHOW VARIABLES LIKE "performance_schema_digests_size";
+SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size";
 SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest;
 
 # Cleanup for Digest
diff --git a/mysql-test/suite/perfschema/t/disabled.def b/mysql-test/suite/perfschema/t/disabled.def
index 888298bbb09..2dc57ee9ad0 100644
--- a/mysql-test/suite/perfschema/t/disabled.def
+++ b/mysql-test/suite/perfschema/t/disabled.def
@@ -9,3 +9,4 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
+# perfschema.pfs_ccccccc                   : Bug#nnnnnnnn 2014-09-10 Anitha Frequent failures on PB2
diff --git a/mysql-test/suite/perfschema/t/dml_esms_by_program.test b/mysql-test/suite/perfschema/t/dml_esms_by_program.test
new file mode 100644
index 00000000000..b80b9aa5039
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_esms_by_program.test
@@ -0,0 +1,44 @@
+# This line and the line below is a temporary line for tests that do not need MyISAM in future, but need to be kept for tests that need it.
+#--source include/have_myisam.inc
+
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+#--disable_result_log 
+select * from performance_schema.events_statements_summary_by_program
+  where object_name like 'XXYYZZ%' limit 1;
+
+select * from performance_schema.events_statements_summary_by_program
+  where object_name='XXYYZZ';
+#--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_statements_summary_by_program
+  set count_star=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_statements_summary_by_program
+  set count_star=12 where object_name like "XXYYZZ";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_statements_summary_by_program
+  where count_star=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_statements_summary_by_program;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_statements_summary_by_program READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_statements_summary_by_program WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_ets_by_account_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ets_by_account_by_event_name.test
new file mode 100644
index 00000000000..ede5f708dd9
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_ets_by_account_by_event_name.test
@@ -0,0 +1,42 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_summary_by_account_by_event_name
+  set count_star=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_summary_by_account_by_event_name
+  set count_star=12 where event_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_summary_by_account_by_event_name
+  where count_star=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_summary_by_account_by_event_name;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_summary_by_account_by_event_name READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_summary_by_account_by_event_name WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_ets_by_host_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ets_by_host_by_event_name.test
new file mode 100644
index 00000000000..a2163b166fd
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_ets_by_host_by_event_name.test
@@ -0,0 +1,42 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_summary_by_host_by_event_name
+  set count_star=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_summary_by_host_by_event_name
+  set count_star=12 where event_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_summary_by_host_by_event_name
+  where count_star=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_summary_by_host_by_event_name;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_summary_by_host_by_event_name READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_summary_by_host_by_event_name WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_ets_by_thread_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ets_by_thread_by_event_name.test
new file mode 100644
index 00000000000..bbbb0cadcf2
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_ets_by_thread_by_event_name.test
@@ -0,0 +1,42 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_summary_by_thread_by_event_name
+  set count_star=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_summary_by_thread_by_event_name
+  set count_star=12 where event_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_summary_by_thread_by_event_name
+  where count_star=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_summary_by_thread_by_event_name;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_summary_by_thread_by_event_name READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_summary_by_thread_by_event_name WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_ets_by_user_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ets_by_user_by_event_name.test
new file mode 100644
index 00000000000..dcca969c041
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_ets_by_user_by_event_name.test
@@ -0,0 +1,42 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_summary_by_user_by_event_name
+  set count_star=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_summary_by_user_by_event_name
+  set count_star=12 where event_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_summary_by_user_by_event_name
+  where count_star=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_summary_by_user_by_event_name;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_summary_by_user_by_event_name READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_summary_by_user_by_event_name WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_ets_global_by_event_name.test b/mysql-test/suite/perfschema/t/dml_ets_global_by_event_name.test
new file mode 100644
index 00000000000..f5c11cf8fda
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_ets_global_by_event_name.test
@@ -0,0 +1,41 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_summary_global_by_event_name
+  set count_star=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_summary_global_by_event_name
+  set count_star=12 where event_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_summary_global_by_event_name
+  where count_star=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_summary_global_by_event_name;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_summary_global_by_event_name READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_summary_global_by_event_name WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_events_transactions_current.test b/mysql-test/suite/perfschema/t/dml_events_transactions_current.test
new file mode 100644
index 00000000000..99ab2eda766
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_events_transactions_current.test
@@ -0,0 +1,41 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_current
+  set timer_start=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_current
+  set timer_start=12 where thread_id=0;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_current
+  where thread_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_current;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_current READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_current WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_events_transactions_history.test b/mysql-test/suite/perfschema/t/dml_events_transactions_history.test
new file mode 100644
index 00000000000..dfad802f219
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_events_transactions_history.test
@@ -0,0 +1,47 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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;
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_history
+  set timer_start=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_history
+  set timer_start=12 where thread_id=0;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_history
+  where thread_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_history;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_history READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_history WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_events_transactions_history_long.test b/mysql-test/suite/perfschema/t/dml_events_transactions_history_long.test
new file mode 100644
index 00000000000..b78f3e167d9
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_events_transactions_history_long.test
@@ -0,0 +1,47 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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;
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_history_long
+  set timer_start=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.events_transactions_history_long
+  set timer_start=12 where thread_id=0;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_history_long
+  where thread_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.events_transactions_history_long;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_history_long READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.events_transactions_history_long WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_file_instances.test b/mysql-test/suite/perfschema/t/dml_file_instances.test
index 33969452f03..e5d1e9903ec 100644
--- a/mysql-test/suite/perfschema/t/dml_file_instances.test
+++ b/mysql-test/suite/perfschema/t/dml_file_instances.test
@@ -2,6 +2,7 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+--source include/have_innodb.inc
 
 --disable_result_log
 select * from performance_schema.file_instances limit 1;
@@ -33,11 +34,72 @@ UNLOCK TABLES;
 LOCK TABLES performance_schema.file_instances WRITE;
 UNLOCK TABLES;
 
-
-
 --echo #
 --echo # MDEV-25325 column_comment for performance_schema tables
 --echo #
 select column_name, column_comment 
 from information_schema.columns 
 where table_schema='performance_schema' and table_name='file_instances';
+
+--echo ###
+--echo ### Bug#26152751: INNODB LEAKS MEMORY, PERFORMANCE_SCHEMA FILE_INSTANCES
+--echo ###               #SQL-IB3129987-252773.IBD
+--echo ###
+
+CREATE DATABASE db_26152751;
+USE db_26152751;
+
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+CREATE TABLE t_db_26152751 (a INT) ENGINE=MYISAM;
+
+--sorted_result
+--replace_regex /.*\/t_db_26152751/t_db_26152751/
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+RENAME TABLE t_db_26152751 to t_db_26152751_new;
+
+--sorted_result
+--replace_regex /.*\/t_db_26152751/t_db_26152751/
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+RENAME TABLE t_db_26152751_new to t_db_26152751;
+
+--sorted_result
+--replace_regex /.*\/t_db_26152751/t_db_26152751/
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+ALTER TABLE t_db_26152751 ADD COLUMN b INT;
+
+--replace_regex /.*\/t_db_26152751/t_db_26152751/
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+DROP TABLE t_db_26152751;
+
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+CREATE TABLE t_db_26152751 (a INT) ENGINE=INNODB;
+
+--replace_regex /.*\/t_db_26152751/t_db_26152751/
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+RENAME TABLE t_db_26152751 to t_db_26152751_new;
+
+--replace_regex /.*\/t_db_26152751/t_db_26152751/
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+RENAME TABLE t_db_26152751_new to t_db_26152751;
+
+--replace_regex /.*\/t_db_26152751/t_db_26152751/
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+ALTER TABLE t_db_26152751 ADD COLUMN b INT;
+
+--replace_regex /.*\/t_db_26152751/t_db_26152751/
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+DROP TABLE t_db_26152751;
+
+SELECT FILE_NAME FROM performance_schema.file_instances WHERE FILE_NAME LIKE "%t_db_26152751%";
+
+DROP DATABASE db_26152751;
diff --git a/mysql-test/suite/perfschema/t/dml_global_status.test b/mysql-test/suite/perfschema/t/dml_global_status.test
new file mode 100644
index 00000000000..65f7c3f5564
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_global_status.test
@@ -0,0 +1,36 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+select * from performance_schema.global_status
+  where variable_name like 'bytes_%' limit 1;
+
+select * from performance_schema.global_status
+  where variable_name='FOO';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.global_status
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.global_status
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.global_status
+  where variable_name <> 'FOO';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.global_status;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.global_status READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.global_status WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_global_variables.test b/mysql-test/suite/perfschema/t/dml_global_variables.test
new file mode 100644
index 00000000000..20507732818
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_global_variables.test
@@ -0,0 +1,36 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+select * from performance_schema.global_variables
+  where variable_name like 'autocommit%' limit 1;
+
+select * from performance_schema.global_variables
+  where variable_name='FOO';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.global_variables
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.global_variables
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.global_variables
+  where variable_name <> 'FOO';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.global_variables;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.global_variables READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.global_variables WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_handler.test b/mysql-test/suite/perfschema/t/dml_handler.test
index f12cc82f22f..16810fcba82 100644
--- a/mysql-test/suite/perfschema/t/dml_handler.test
+++ b/mysql-test/suite/perfschema/t/dml_handler.test
@@ -12,9 +12,9 @@
 # which should return error 1031, "Table storage engine for '<table name>'
 # doesn't have this option."
 #
---echo
+--echo #
 --echo # Create a temporary table of performance schema table names
---echo
+--echo #
  
 CREATE TEMPORARY TABLE table_list (id INT AUTO_INCREMENT, PRIMARY KEY (id)) AS
   SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
@@ -25,10 +25,10 @@ SELECT COUNT(*) FROM table_list INTO @table_count;
 
 let $count=`SELECT @table_count`;
 
---echo
+--echo #
 --echo # For each table in the performance schema, attempt HANDLER...OPEN,
 --echo # which should fail with an error 1031, ER_ILLEGAL_HA.
---echo
+--echo #
 
 while ($count > 0)
 {
diff --git a/mysql-test/suite/perfschema/t/dml_mems_by_account_by_event_name.test b/mysql-test/suite/perfschema/t/dml_mems_by_account_by_event_name.test
new file mode 100644
index 00000000000..a620f586553
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_mems_by_account_by_event_name.test
@@ -0,0 +1,42 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.memory_summary_by_account_by_event_name
+  set count_alloc=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.memory_summary_by_account_by_event_name
+  set count_alloc=12 where event_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.memory_summary_by_account_by_event_name
+  where count_alloc=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.memory_summary_by_account_by_event_name;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.memory_summary_by_account_by_event_name READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.memory_summary_by_account_by_event_name WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_mems_by_host_by_event_name.test b/mysql-test/suite/perfschema/t/dml_mems_by_host_by_event_name.test
new file mode 100644
index 00000000000..71c21457691
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_mems_by_host_by_event_name.test
@@ -0,0 +1,42 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.memory_summary_by_host_by_event_name
+  set count_alloc=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.memory_summary_by_host_by_event_name
+  set count_alloc=12 where event_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.memory_summary_by_host_by_event_name
+  where count_alloc=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.memory_summary_by_host_by_event_name;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.memory_summary_by_host_by_event_name READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.memory_summary_by_host_by_event_name WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_mems_by_thread_by_event_name.test b/mysql-test/suite/perfschema/t/dml_mems_by_thread_by_event_name.test
new file mode 100644
index 00000000000..5a75dbe78f2
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_mems_by_thread_by_event_name.test
@@ -0,0 +1,42 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.memory_summary_by_thread_by_event_name
+  set count_alloc=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.memory_summary_by_thread_by_event_name
+  set count_alloc=12 where event_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.memory_summary_by_thread_by_event_name
+  where count_alloc=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.memory_summary_by_thread_by_event_name;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.memory_summary_by_thread_by_event_name READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.memory_summary_by_thread_by_event_name WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_mems_by_user_by_event_name.test b/mysql-test/suite/perfschema/t/dml_mems_by_user_by_event_name.test
new file mode 100644
index 00000000000..3cf63097356
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_mems_by_user_by_event_name.test
@@ -0,0 +1,42 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.memory_summary_by_user_by_event_name
+  set count_alloc=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.memory_summary_by_user_by_event_name
+  set count_alloc=12 where event_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.memory_summary_by_user_by_event_name
+  where count_alloc=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.memory_summary_by_user_by_event_name;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.memory_summary_by_user_by_event_name READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.memory_summary_by_user_by_event_name WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_mems_global_by_event_name.test b/mysql-test/suite/perfschema/t/dml_mems_global_by_event_name.test
new file mode 100644
index 00000000000..4e716dc668f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_mems_global_by_event_name.test
@@ -0,0 +1,42 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.memory_summary_global_by_event_name
+  set count_alloc=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.memory_summary_global_by_event_name
+  set count_alloc=12 where event_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.memory_summary_global_by_event_name
+  where count_alloc=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.memory_summary_global_by_event_name;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.memory_summary_global_by_event_name READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.memory_summary_global_by_event_name WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_metadata_locks.test b/mysql-test/suite/perfschema/t/dml_metadata_locks.test
new file mode 100644
index 00000000000..d4ace2c708b
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_metadata_locks.test
@@ -0,0 +1,35 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+select * from performance_schema.metadata_locks;
+--enable_result_log
+
+select * from performance_schema.metadata_locks
+  where object_name='foo';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.metadata_locks
+  set object_name='FOO', owner_thread_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.metadata_locks
+  set owner_thread_id=12 where object_name='foo';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.metadata_locks;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.metadata_locks
+  where timer_name='CYCLE';
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.metadata_locks READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.metadata_locks WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_prepared_statements_instances.test b/mysql-test/suite/perfschema/t/dml_prepared_statements_instances.test
new file mode 100644
index 00000000000..3c96740df77
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_prepared_statements_instances.test
@@ -0,0 +1,43 @@
+# This line and the line below is a temporary line for tests that do not need MyISAM in future, but need to be kept for tests that need it.
+#--source include/have_myisam.inc
+
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+#--disable_result_log 
+select * from performance_schema.prepared_statements_instances
+  where owner_object_name like 'XXYYZZ%' limit 1;
+
+select * from performance_schema.prepared_statements_instances
+  where owner_object_name='XXYYZZ';
+#--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+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 ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.prepared_statements_instances set count_execute=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.prepared_statements_instances
+  set count_execute=12 where owner_object_name like "XXYYZZ";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.prepared_statements_instances
+  where count_execute=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.prepared_statements_instances;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.prepared_statements_instances READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.prepared_statements_instances WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_replication_applier_configuration.test b/mysql-test/suite/perfschema/t/dml_replication_applier_configuration.test
new file mode 100644
index 00000000000..f465e8f7c0c
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_replication_applier_configuration.test
@@ -0,0 +1,38 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DMLs on the table replication_applier_configuration.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+SELECT * FROM performance_schema.replication_applier_configuration
+  LIMIT 1;
+
+sELECT * FROM performance_schema.replication_applier_configuration
+  WHERE desired_delay=12;
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+INSERT INTO performance_schema.replication_applier_configuration
+  SET desired_delay=2;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_applier_configuration
+  SET desired_delay=12 WHERE desired_delay=2;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_applier_configuration
+  WHERE desired_delay=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_applier_configuration;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_applier_configuration READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_applier_configuration WRITE;
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/t/dml_replication_applier_status.test b/mysql-test/suite/perfschema/t/dml_replication_applier_status.test
new file mode 100644
index 00000000000..d2738c1c099
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_replication_applier_status.test
@@ -0,0 +1,42 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DMLs on the table replication_applier_status.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+SELECT * FROM performance_schema.replication_applier_status
+  LIMIT 1;
+
+SELECT * FROM performance_schema.replication_applier_status
+  WHERE service_state='YES' OR remaining_delay=12;
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+INSERT INTO performance_schema.replication_applier_status
+  SET service_state='YES', remaining_delay=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_applier_status
+  SET remaining_delay=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_applier_status
+  SET remaining_delay=12 WHERE service_state='YES';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_applier_status
+  WHERE service_state='YES';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_applier_status;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_applier_status READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_applier_status WRITE;
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/t/dml_replication_applier_status_by_coordinator.test b/mysql-test/suite/perfschema/t/dml_replication_applier_status_by_coordinator.test
new file mode 100644
index 00000000000..6c1b82b823c
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_replication_applier_status_by_coordinator.test
@@ -0,0 +1,43 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DMLs on the table replication_applier_status_by_coordinator
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_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 ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_applier_status_by_coordinator
+  SET last_error_number=1234;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_applier_status_by_coordinator
+  SET last_error_number=1234 where service_state like "YES";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_applier_status_by_coordinator
+  WHERE thread_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_applier_status_by_coordinator;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_applier_status_by_coordinator READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_applier_status_by_coordinator WRITE;
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/t/dml_replication_applier_status_by_worker.test b/mysql-test/suite/perfschema/t/dml_replication_applier_status_by_worker.test
new file mode 100644
index 00000000000..53f50935258
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_replication_applier_status_by_worker.test
@@ -0,0 +1,43 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DMLs on the table replication_applier_status_by_worker.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_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 ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_applier_status_by_worker
+  SET worker_id=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_applier_status_by_worker
+  SET worker_d=12 where service_state like "YES";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_applier_status_by_worker
+  WHERE worker_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_applier_status_by_worker;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_applier_status_by_worker READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_applier_status_by_worker WRITE;
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/t/dml_replication_connection_configuration.test b/mysql-test/suite/perfschema/t/dml_replication_connection_configuration.test
new file mode 100644
index 00000000000..b787cbf8f63
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_replication_connection_configuration.test
@@ -0,0 +1,43 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DMLs on the table replication_connection_configuration.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+SELECT * FROM performance_schema.replication_connection_configuration
+  LIMIT 1;
+
+SELECT * FROM performance_schema.replication_connection_configuration
+  WHERE user='FOO' or host='BAR';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+INSERT INTO performance_schema.replication_connection_configuration
+  SET user='FOO', host='BAR',
+  port=1, connection_retry_count=2;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_connection_configuration
+  SET connection_retry_interval=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_connection_configuration
+  SET connection_retry_interval=12 WHERE host LIKE "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_connection_configuration
+  WHERE connection_retry_count=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_connection_configuration;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_connection_configuration READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_connection_configuration WRITE;
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/t/dml_replication_connection_status.test b/mysql-test/suite/perfschema/t/dml_replication_connection_status.test
new file mode 100644
index 00000000000..207ee9f5b32
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_replication_connection_status.test
@@ -0,0 +1,43 @@
+# Tests for PERFORMANCE_SCHEMA
+
+# This test verifies the correct behaviour in case of invalid
+# usage of DMLs on the table replication_connection_status.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+INSERT INTO performance_schema.replication_connection_status
+  SET received_transaction_set='FOO', last_error_message='BAR',
+  thread_id=1, last_error_number=2;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_connection_status
+  SET last_error_number=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_connection_status
+  SET thread_id=12 WHERE received_transaction_set like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_connection_status
+  WHERE last_error_number=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_connection_status;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_connection_status READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_connection_status WRITE;
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/t/dml_replication_group_member_stats.test b/mysql-test/suite/perfschema/t/dml_replication_group_member_stats.test
new file mode 100644
index 00000000000..db42ce2d7de
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_replication_group_member_stats.test
@@ -0,0 +1,38 @@
+# This test verifies the correct behaviour in case of invalid
+# usage of DMLs on the table replication_group_member_stats
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+SELECT * FROM performance_schema.replication_group_member_stats
+  LIMIT 1;
+
+SELECT * FROM performance_schema.replication_group_member_stats
+  WHERE channel_name='FOO';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+INSERT INTO performance_schema.replication_group_member_stats
+  SET channel_name='FOO', node_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_group_member_stats
+  SET member_id=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_group_member_stats
+  SET member_id=12 WHERE group_name LIKE "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_group_member_stats
+  WHERE member_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_group_member_stats;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_group_member_stats READ;
+UNLOCK TABLES;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_group_member_stats WRITE;
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/t/dml_replication_group_members.test b/mysql-test/suite/perfschema/t/dml_replication_group_members.test
new file mode 100644
index 00000000000..1a49b2d162f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_replication_group_members.test
@@ -0,0 +1,40 @@
+# This test verifies the correct behaviour in case of invalid
+# usage of DMLs on the table replication_group_members.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+SELECT * FROM performance_schema.replication_group_members
+  LIMIT 1;
+
+SELECT * FROM performance_schema.replication_group_members
+  WHERE channel_name='FOO';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+INSERT INTO performance_schema.replication_group_members
+  SET channel_name='FOO', member_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_group_members
+  SET member_id=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+UPDATE performance_schema.replication_group_members
+  SET member_id=12 WHERE channel_name LIKE "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_group_members
+  WHERE member_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+DELETE FROM performance_schema.replication_group_members;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_group_members READ;
+UNLOCK TABLES;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.replication_group_members WRITE;
+UNLOCK TABLES;
diff --git a/mysql-test/suite/perfschema/t/dml_session_status.test b/mysql-test/suite/perfschema/t/dml_session_status.test
new file mode 100644
index 00000000000..c5995738636
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_session_status.test
@@ -0,0 +1,36 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+select * from performance_schema.session_status
+  where variable_name like 'bytes_%' limit 1;
+
+select * from performance_schema.session_status
+  where variable_name='FOO';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.session_status
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.session_status
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.session_status
+  where variable_name <> 'FOO';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.session_status;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.session_status READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.session_status WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_session_variables.test b/mysql-test/suite/perfschema/t/dml_session_variables.test
new file mode 100644
index 00000000000..0640ce05ebb
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_session_variables.test
@@ -0,0 +1,36 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+select * from performance_schema.session_variables
+  where variable_name like 'bytes_%' limit 1;
+
+select * from performance_schema.session_variables
+  where variable_name='FOO';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.session_variables
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.session_variables
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.session_variables
+  where variable_name <> 'FOO';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.session_variables;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.session_variables READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.session_variables WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_setup_actors.test b/mysql-test/suite/perfschema/t/dml_setup_actors.test
index 4d39ef3cb2e..e6c17de37dc 100644
--- a/mysql-test/suite/perfschema/t/dml_setup_actors.test
+++ b/mysql-test/suite/perfschema/t/dml_setup_actors.test
@@ -10,6 +10,16 @@ drop table if exists test.setup_actors;
 # Save the setup
 create table test.setup_actors as
   select * from performance_schema.setup_actors;
+
+# Inserting Duplicate values in the table should
+# throw error
+--error ER_DUP_KEY
+insert into performance_schema.setup_actors
+  values ('%','%','%','YES', 'YES');
+--error ER_DUP_KEY
+insert into performance_schema.setup_actors
+  values ('%','%','%','NO', 'NO');
+
 truncate table performance_schema.setup_actors;
 
 select * from performance_schema.setup_actors;
@@ -29,6 +39,16 @@ insert into performance_schema.setup_actors
 insert into performance_schema.setup_actors
   set user='%', host='%';
 
+# Insert with wrong value for ENABLED column
+--error 1265
+insert into performance_schema.setup_actors
+  values ('localhost', 'user1', '%', 'NO%', 'NO');
+
+# Insert with wrong value for HISTORY column
+--error 1265
+insert into performance_schema.setup_actors
+  values ('localhost', 'user1', '%', 'NO', 'KO');
+
 select * from performance_schema.setup_actors
   order by USER, HOST;
 
@@ -44,6 +64,44 @@ update performance_schema.setup_actors
 update performance_schema.setup_actors
   set role='ILLEGAL';
 
+# update on ENABLED column is allowed
+update performance_schema.setup_actors
+  set ENABLED='YES';
+
+# update on HISTORY column is allowed
+update performance_schema.setup_actors
+  set HISTORY='YES';
+
+# update on ENABLED column with wrong values
+#throws error
+--error 1265
+update performance_schema.setup_actors
+  set ENABLED='';
+
+--error 1265
+update performance_schema.setup_actors
+  set ENABLED='YESS';
+
+--error 1265
+update performance_schema.setup_actors
+  set ENABLED='NO%';
+
+--error ER_BAD_NULL_ERROR
+update performance_schema.setup_actors
+  set ENABLED=NULL;
+
+--error 1265
+update performance_schema.setup_actors
+  set HISTORY='YESS';
+
+--error 1265
+update performance_schema.setup_actors
+  set HISTORY='NO%';
+
+--error ER_BAD_NULL_ERROR
+update performance_schema.setup_actors
+  set HISTORY=NULL;
+
 select * from performance_schema.setup_actors
   order by USER, HOST;
 
@@ -64,6 +122,17 @@ UNLOCK TABLES;
 LOCK TABLES performance_schema.setup_actors WRITE;
 UNLOCK TABLES;
 
+--echo #
+--echo # WL#2284: Increase the length of a user name
+--echo #
+
+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';
+
+
 # Restore the setup
 truncate table performance_schema.setup_actors;
 insert into performance_schema.setup_actors
diff --git a/mysql-test/suite/perfschema/t/dml_setup_instruments.test b/mysql-test/suite/perfschema/t/dml_setup_instruments.test
index e3cc07fb889..f66f8d28176 100644
--- a/mysql-test/suite/perfschema/t/dml_setup_instruments.test
+++ b/mysql-test/suite/perfschema/t/dml_setup_instruments.test
@@ -33,12 +33,17 @@ select * from performance_schema.setup_instruments
 
 # COND_handler_count is dependent on the build (Windows only)
 # DEBUG_SYNC::cond is dependent on the build (DEBUG only)
+# COND_main_thread_in_use is dependent on the build (non Windows)
+# COND_start_signal_handler is dependent on the build (non Windows)
 
 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;
 
 --disable_result_log
@@ -85,19 +90,17 @@ UNLOCK TABLES;
 LOCK TABLES performance_schema.setup_instruments WRITE;
 UNLOCK TABLES;
 
---echo
+--echo #
 --echo # Bug#13813193 ASSERTION `TABLE->READ_SET ==
 --echo # &TABLE->DEF_READ_SET' FAILED / MYSQL_UPDATE
---echo
+--echo #
 UPDATE performance_schema.setup_instruments SET timed='NO'
 ORDER BY RAND();
 
-# MTR is configured to start with everything set to ON,
-# so we need to restore it after the previous update
---disable_query_log
-update performance_schema.setup_instruments set timed='YES';
---enable_query_log
+# Test cleanup
 
+update performance_schema.setup_instruments
+  set enabled='YES', TIMED='YES';
 
 --echo #
 --echo # MDEV-25325 column_comment for performance_schema tables
diff --git a/mysql-test/suite/perfschema/t/dml_setup_objects.test b/mysql-test/suite/perfschema/t/dml_setup_objects.test
index 8c9374293ef..3055cd8b007 100644
--- a/mysql-test/suite/perfschema/t/dml_setup_objects.test
+++ b/mysql-test/suite/perfschema/t/dml_setup_objects.test
@@ -6,7 +6,7 @@
 --disable_warnings
 drop table if exists test.setup_objects;
 --enable_warnings
-
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
 # Save the setup
 create table test.setup_objects as
   select * from performance_schema.setup_objects;
@@ -93,7 +93,7 @@ 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;
 --echo #
 --echo # MDEV-25325 column_comment for performance_schema tables
 --echo #
diff --git a/mysql-test/suite/perfschema/t/dml_setup_timers.test b/mysql-test/suite/perfschema/t/dml_setup_timers.test
index c14ad6e73c2..6a90c669bf2 100644
--- a/mysql-test/suite/perfschema/t/dml_setup_timers.test
+++ b/mysql-test/suite/perfschema/t/dml_setup_timers.test
@@ -12,6 +12,8 @@ update performance_schema.setup_timers
 update performance_schema.setup_timers
   set timer_name='NANOSECOND' where name="statement";
 update performance_schema.setup_timers
+  set timer_name='MICROSECOND' where name="transaction";
+update performance_schema.setup_timers
   set timer_name='MICROSECOND' where name="idle";
 
 select * from performance_schema.setup_timers;
@@ -60,6 +62,8 @@ update performance_schema.setup_timers
 update performance_schema.setup_timers
  set timer_name='NANOSECOND' where name="statement";
 update performance_schema.setup_timers
+  set timer_name='MICROSECOND' where name="transaction";
+update performance_schema.setup_timers
   set timer_name='MICROSECOND' where name="idle";
 
 select * from performance_schema.setup_timers;
diff --git a/mysql-test/suite/perfschema/t/dml_status_by_account.test b/mysql-test/suite/perfschema/t/dml_status_by_account.test
new file mode 100644
index 00000000000..5b31a572955
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_status_by_account.test
@@ -0,0 +1,40 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.status_by_account
+  set user='USER', host='HOST', variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.status_by_account
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.status_by_account
+  set variable_name='FOO' where user <> 'USER';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.status_by_account
+  where user <> 'USER';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.status_by_account;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.status_by_account READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.status_by_account WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_status_by_host.test b/mysql-test/suite/perfschema/t/dml_status_by_host.test
new file mode 100644
index 00000000000..6c5c4462688
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_status_by_host.test
@@ -0,0 +1,40 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.status_by_host
+  set host='HOST', variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.status_by_host
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.status_by_host
+  set variable_name='FOO' where host <> 'HOST';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.status_by_host
+  where host <> 'HOST';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.status_by_host;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.status_by_host READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.status_by_host WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_status_by_thread.test b/mysql-test/suite/perfschema/t/dml_status_by_thread.test
new file mode 100644
index 00000000000..09022b05a47
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_status_by_thread.test
@@ -0,0 +1,40 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.status_by_thread
+  set thread_id=1, variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.status_by_thread
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.status_by_thread
+  set variable_name='FOO' where thread_id=0;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.status_by_thread
+  where thread_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.status_by_thread;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.status_by_thread READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.status_by_thread WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_status_by_user.test b/mysql-test/suite/perfschema/t/dml_status_by_user.test
new file mode 100644
index 00000000000..25cba557228
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_status_by_user.test
@@ -0,0 +1,40 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.status_by_user
+  set user='USER', variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.status_by_user
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.status_by_user
+  set variable_name='FOO' where user <> 'USER';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.status_by_user
+  where user <> 'USER';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.status_by_user;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.status_by_user READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.status_by_user WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_table_handles.test b/mysql-test/suite/perfschema/t/dml_table_handles.test
new file mode 100644
index 00000000000..31f5fe0bc46
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_table_handles.test
@@ -0,0 +1,35 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+select * from performance_schema.table_handles;
+--enable_result_log
+
+select * from performance_schema.table_handles
+  where object_name='foo';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.table_handles
+  set object_name='FOO', owner_event_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.table_handles
+  set owner_event_id=12 where object_name='foo';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.table_handles;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.table_handles
+  where timer_name='CYCLE';
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.table_handles READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.table_handles WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/dml_uvar_by_thread.test b/mysql-test/suite/perfschema/t/dml_uvar_by_thread.test
new file mode 100644
index 00000000000..71518d35d1f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_uvar_by_thread.test
@@ -0,0 +1,48 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log 
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.user_variables_by_thread
+  set thread_id=12, variable_name='foo', variable_value='bar';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.user_variables_by_thread
+  set thread_id=12;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.user_variables_by_thread
+  set thread_id=12 where variable_name like "FOO";
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.user_variables_by_thread
+  where thread_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.user_variables_by_thread;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.user_variables_by_thread READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.user_variables_by_thread WRITE;
+UNLOCK TABLES;
+
+DELIMITER |;
+-- error ER_DBACCESS_DENIED_ERROR
+CREATE TRIGGER test_uvar_trigger
+    AFTER INSERT ON performance_schema.user_variables_by_thread
+     FOR EACH ROW BEGIN
+     set @a='OK';
+END|
+DELIMITER ;|
diff --git a/mysql-test/suite/perfschema/t/dml_variables_by_thread.test b/mysql-test/suite/perfschema/t/dml_variables_by_thread.test
new file mode 100644
index 00000000000..db087d58ba4
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/dml_variables_by_thread.test
@@ -0,0 +1,40 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_result_log
+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';
+--enable_result_log
+
+--error ER_TABLEACCESS_DENIED_ERROR
+insert into performance_schema.variables_by_thread
+  set thread_id=1, variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.variables_by_thread
+  set variable_name='FOO', variable_value='BAR';
+
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.variables_by_thread
+  set variable_name='FOO' where thread_id=0;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.variables_by_thread
+  where thread_id=1;
+
+--error ER_TABLEACCESS_DENIED_ERROR
+delete from performance_schema.variables_by_thread;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.variables_by_thread READ;
+UNLOCK TABLES;
+
+-- error ER_TABLEACCESS_DENIED_ERROR
+LOCK TABLES performance_schema.variables_by_thread WRITE;
+UNLOCK TABLES;
+
diff --git a/mysql-test/suite/perfschema/t/event_aggregate.test b/mysql-test/suite/perfschema/t/event_aggregate.test
index 372cda050ee..685cbbaed28 100644
--- a/mysql-test/suite/perfschema/t/event_aggregate.test
+++ b/mysql-test/suite/perfschema/t/event_aggregate.test
@@ -1,6 +1,5 @@
 # Tests for the performance schema
 #
-
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc
 --source ../include/event_aggregate_cleanup.inc
diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_a.test b/mysql-test/suite/perfschema/t/event_aggregate_no_a.test
index 372cda050ee..685cbbaed28 100644
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_a.test
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a.test
@@ -1,6 +1,5 @@
 # Tests for the performance schema
 #
-
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc
 --source ../include/event_aggregate_cleanup.inc
diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test
index 372cda050ee..685cbbaed28 100644
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_h.test
@@ -1,6 +1,5 @@
 # Tests for the performance schema
 #
-
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc
 --source ../include/event_aggregate_cleanup.inc
diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test
index 372cda050ee..685cbbaed28 100644
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u.test
@@ -1,6 +1,5 @@
 # Tests for the performance schema
 #
-
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc
 --source ../include/event_aggregate_cleanup.inc
diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test
index 372cda050ee..685cbbaed28 100644
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_a_no_u_no_h.test
@@ -1,6 +1,5 @@
 # Tests for the performance schema
 #
-
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc
 --source ../include/event_aggregate_cleanup.inc
diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_h.test b/mysql-test/suite/perfschema/t/event_aggregate_no_h.test
index 372cda050ee..685cbbaed28 100644
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_h.test
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_h.test
@@ -1,6 +1,5 @@
 # Tests for the performance schema
 #
-
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc
 --source ../include/event_aggregate_cleanup.inc
diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_u.test b/mysql-test/suite/perfschema/t/event_aggregate_no_u.test
index 372cda050ee..685cbbaed28 100644
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_u.test
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_u.test
@@ -1,6 +1,5 @@
 # Tests for the performance schema
 #
-
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc
 --source ../include/event_aggregate_cleanup.inc
diff --git a/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test b/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test
index 372cda050ee..685cbbaed28 100644
--- a/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test
+++ b/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test
@@ -1,6 +1,5 @@
 # Tests for the performance schema
 #
-
 --source ../include/event_aggregate_setup.inc
 --source ../include/event_aggregate_load.inc
 --source ../include/event_aggregate_cleanup.inc
diff --git a/mysql-test/suite/perfschema/t/file_misc-master.opt b/mysql-test/suite/perfschema/t/file_misc-master.opt
new file mode 100644
index 00000000000..9d6fb53ff50
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/file_misc-master.opt
@@ -0,0 +1 @@
+--loose-performance-schema-max-file-instances=0
diff --git a/mysql-test/suite/perfschema/t/file_misc.test b/mysql-test/suite/perfschema/t/file_misc.test
new file mode 100644
index 00000000000..e495aa90676
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/file_misc.test
@@ -0,0 +1,11 @@
+
+# Bug#22118669 - ASSERTION `PFS_FILE != __NULL' FAILED
+ 
+# Cause a temporary file to be instrumented,
+# while there are no file instruments available.
+
+--disable_result_log
+select * from information_schema.columns ORDER BY table_name;
+--enable_result_log
+
+
diff --git a/mysql-test/suite/perfschema/t/func_file_io.test b/mysql-test/suite/perfschema/t/func_file_io.test
index 2055fa9a008..e29b05b81ff 100644
--- a/mysql-test/suite/perfschema/t/func_file_io.test
+++ b/mysql-test/suite/perfschema/t/func_file_io.test
@@ -189,5 +189,5 @@ ORDER BY p.processlist_user, h.operation;
 UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
 
 # In case of failure, will indicate the root cause
-show status like "performance_schema%";
+show global status like "performance_schema%";
 
diff --git a/mysql-test/suite/perfschema/t/func_mutex.test b/mysql-test/suite/perfschema/t/func_mutex.test
index 66bcb68accb..1964852134d 100644
--- a/mysql-test/suite/perfschema/t/func_mutex.test
+++ b/mysql-test/suite/perfschema/t/func_mutex.test
@@ -21,7 +21,7 @@ flush status;
 select NAME from performance_schema.mutex_instances
   where NAME = 'wait/synch/mutex/mysys/THR_LOCK::mutex' GROUP BY NAME;
 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;
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
@@ -130,5 +130,5 @@ DROP TABLE t1;
 UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
 
 # In case of failure, will indicate the root cause
-show status like "performance_schema%";
+show global status like "performance_schema%";
 
diff --git a/mysql-test/suite/perfschema/t/global_objects-master.opt b/mysql-test/suite/perfschema/t/global_objects-master.opt
new file mode 100644
index 00000000000..b00c11c1247
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/global_objects-master.opt
@@ -0,0 +1 @@
+--loose-performance-schema-instrument='%=OFF'
diff --git a/mysql-test/suite/perfschema/t/global_objects.test b/mysql-test/suite/perfschema/t/global_objects.test
new file mode 100644
index 00000000000..cf041c14b32
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/global_objects.test
@@ -0,0 +1,29 @@
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+--source include/not_windows.inc
+
+# Bug#79784 update setup_instruments do not affect the global
+# mutex/rwlock/cond
+
+# Verify instruments are off by default, per *.opt file
+select count(*) from performance_schema.setup_instruments
+  where enabled='YES'
+  and name like "wait/%";
+
+# Verify that we have instrumented objects
+select count(*) > 0 from performance_schema.mutex_instances;
+select count(*) > 0 from performance_schema.rwlock_instances;
+select count(*) > 0 from performance_schema.cond_instances;
+select count(*) > 0 from performance_schema.socket_instances;
+
+# Check for some known global objects.
+select NAME from performance_schema.mutex_instances
+  where NAME = "wait/synch/mutex/sql/LOCK_gdl";
+select NAME from performance_schema.rwlock_instances
+  where 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";
+select EVENT_NAME from performance_schema.socket_instances
+  where EVENT_NAME = "wait/io/socket/sql/client_connection";
diff --git a/mysql-test/suite/perfschema/t/grant.test b/mysql-test/suite/perfschema/t/grant.test
new file mode 100644
index 00000000000..446965dfe9d
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/grant.test
@@ -0,0 +1,12 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+#
+# MDEV-22884 Assertion `grant_table || grant_table_role' failed on perfschema
+#
+create user a@localhost;
+connect a,localhost,a;
+select * from performance_schema.global_status where variable_name='b';
+connection default;
+disconnect a;
+drop user a@localhost;
+
diff --git a/mysql-test/suite/perfschema/t/indexed_table_io.test b/mysql-test/suite/perfschema/t/indexed_table_io.test
index 1a7597113d2..59fe4dd134d 100644
--- a/mysql-test/suite/perfschema/t/indexed_table_io.test
+++ b/mysql-test/suite/perfschema/t/indexed_table_io.test
@@ -13,7 +13,7 @@ drop table if exists test.no_index_tab;
 drop table if exists test.index_tab;
 --enable_warnings
 
-let $table_io_select= select COUNT(*)
+let $table_io_select= select SUM(NUMBER_OF_BYTES)
 from performance_schema.events_waits_history_long
 where event_name like 'wait/io/table/%'
 and object_schema = 'test'
@@ -104,7 +104,7 @@ update performance_schema.setup_consumers set enabled='NO';
 eval $table_io_select 'index_tab';
 
 # In case of failures, this will tell if table io are lost.
-show status like 'performance_schema_%';
+show global status like 'performance_schema_%';
 
 # Cleanup
 drop table test.no_index_tab;
diff --git a/mysql-test/suite/perfschema/t/information_schema.test b/mysql-test/suite/perfschema/t/information_schema.test
index 0152ef21905..937a1b4f61b 100644
--- a/mysql-test/suite/perfschema/t/information_schema.test
+++ b/mysql-test/suite/perfschema/t/information_schema.test
@@ -24,9 +24,21 @@ select lower(TABLE_NAME), VERSION, ROW_FORMAT
   where TABLE_SCHEMA='performance_schema'
   order by table_name;
 
+# Query status and system variable tables separately because AVG_ROW_LENGTH
+# depends upon which plugins are loaded at the time of the query.
+#
+# TABLE_ROWS is unpredictable with autoscaling buffers
+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;
+
+--replace_column 2 table_rows 3 avg_row_len
 select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH
   from information_schema.tables
-  where TABLE_SCHEMA='performance_schema'
+  where TABLE_SCHEMA='performance_schema' and
+  lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status'
   order by table_name;
 
 select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH
@@ -49,11 +61,10 @@ select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM
   where TABLE_SCHEMA='performance_schema'
   order by table_name;
 
-# TABLESPACE_NAME does not exist in 5.4
-# select lower(TABLE_NAME), CREATE_OPTIONS, TABLESPACE_NAME
-#   from information_schema.tables
-#   where TABLE_SCHEMA='performance_schema'
-#  order by table_name;
+select lower(TABLE_NAME), CREATE_OPTIONS
+  from information_schema.tables
+  where TABLE_SCHEMA='performance_schema'
+  order by table_name;
 
 select lower(TABLE_NAME), TABLE_COMMENT
   from information_schema.tables
diff --git a/mysql-test/suite/perfschema/t/innodb_events_transactions_history_long.test b/mysql-test/suite/perfschema/t/innodb_events_transactions_history_long.test
new file mode 100644
index 00000000000..f13bfe87689
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/innodb_events_transactions_history_long.test
@@ -0,0 +1,19 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/have_innodb.inc
+
+--echo #
+--echo # MDEV-24600 performance_schema.events_transactions_history_long.trx_id
+--echo #            reports garbage
+--echo #
+
+TRUNCATE performance_schema.events_transactions_history_long;
+
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+COMMIT;
+BEGIN;
+SELECT table_name FROM mysql.innodb_table_stats LIMIT 0 LOCK IN SHARE MODE;
+COMMIT;
+
+SELECT state,trx_id,gtid
+FROM performance_schema.events_transactions_history_long;
diff --git a/mysql-test/suite/perfschema/t/io_cache-master.opt b/mysql-test/suite/perfschema/t/io_cache-master.opt
new file mode 100644
index 00000000000..8f75ada354c
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/io_cache-master.opt
@@ -0,0 +1,3 @@
+--binlog_cache_size=4096
+--binlog_stmt_cache_size=4096
+--log-bin=master-bin
diff --git a/mysql-test/suite/perfschema/t/io_cache.test b/mysql-test/suite/perfschema/t/io_cache.test
new file mode 100644
index 00000000000..201d042530d
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/io_cache.test
@@ -0,0 +1,121 @@
+################## suite/perfschema/t/io_cache.test###################
+#                                                                    #
+# IO_CACHE is a file I/O caching mechanism that uses temporary files #
+# when the cache overflows. This test verifies that the temporary    #
+# files created by the IO_CACHE buffers for the binlog_cache and     #
+# binlog_stmt_cache are instrumented.                                #
+#                                                                    #
+######################################################################
+
+--source include/have_perfschema.inc
+--source include/not_embedded.inc
+--source include/no_protocol.inc
+
+--echo #
+--echo ## Connection default
+--echo #
+--connection default
+--disable_warnings
+USE test;
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+SELECT @@global.binlog_cache_size;
+SELECT @@global.binlog_stmt_cache_size;
+SELECT * FROM performance_schema.setup_instruments WHERE name LIKE "%file/sql/io_cache%";
+
+--echo #
+--echo ## Connection con1
+--echo #
+connect(con1, localhost, root,,);
+USE test;
+CREATE TABLE t1 (s1 INT, s2 VARCHAR(4096));
+SET SESSION AUTOCOMMIT = 0;
+
+#
+# Force an IO_CACHE overflow and subsequent write to a temporary file.
+#
+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;
+--disconnect con1
+
+--echo #
+--echo ## Connection default
+--echo #
+--connection default
+SELECT COUNT(*) FROM test.t1;
+
+#
+# Verify that IO events on the temporary file.
+#
+SELECT COUNT(*) FROM performance_schema.file_summary_by_event_name WHERE event_name LIKE "%io_cache%";
+
+--connection default
+DROP TABLE t1;
+
+
+
diff --git a/mysql-test/suite/perfschema/t/max_program_zero-master.opt b/mysql-test/suite/perfschema/t/max_program_zero-master.opt
new file mode 100644
index 00000000000..7803f9c5e1b
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/max_program_zero-master.opt
@@ -0,0 +1,3 @@
+--loose-performance_schema_max_program_instances=0
+--loose-performance_schema_max_statement_stack=1
+--thread_stack=655360
diff --git a/mysql-test/suite/perfschema/t/max_program_zero.test b/mysql-test/suite/perfschema/t/max_program_zero.test
new file mode 100644
index 00000000000..064ba2ae2d9
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/max_program_zero.test
@@ -0,0 +1,48 @@
+#-------------------------------------------------------------
+# Tests for PERFORMANCE_SCHEMA stored programs instrumentation  
+#-------------------------------------------------------------
+
+#
+#  Test case to show the behaviour of stored program instrumentation 
+#  when values of the system variables performance_schema_max_program_instances & 
+#  performance_schema_max_statement_stack are zero. 
+#  PS table will return empty set 
+#  
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+# Values of variables server variables
+show global variables like "performance_schema_max_program_instances";
+show global variables like "performance_schema_max_statement_stack";
+
+--echo ##################### 
+--echo # Setup
+--echo ##################### 
+--source suite/perfschema/include/program_nested_setup.inc 
+
+# Truncate summary table
+TRUNCATE performance_schema.events_statements_summary_by_program;
+
+--echo #####################
+--echo # Executing Queries
+--echo ##################### 
+--source suite/perfschema/include/program_nested_execution.inc 
+
+--echo ###########################################
+--echo # Quering PS statement summary table      #
+--echo ########################################### 
+
+SELECT OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
+       FROM performance_schema.events_statements_summary_by_program;
+
+SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_program; 
+
+--echo ##################### 
+--echo # Cleanup
+--echo ##################### 
+--source suite/perfschema/include/program_nested_cleanup.inc 
+
+
diff --git a/mysql-test/suite/perfschema/t/mdl_func.test b/mysql-test/suite/perfschema/t/mdl_func.test
new file mode 100644
index 00000000000..7f422a6e870
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/mdl_func.test
@@ -0,0 +1,479 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+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');
+
+--echo # Switch to (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+
+let $user1_tid=`select THREAD_ID from performance_schema.threads where PROCESSLIST_ID=connection_id()`;
+
+--echo # Switch to (con2, localhost, user2, , )
+connect (con2, localhost, user2, , );
+
+let $user2_tid=`select THREAD_ID from performance_schema.threads where PROCESSLIST_ID=connection_id()`;
+
+--connection default
+
+--disable_query_log
+--eval set @user1_tid= $user1_tid;
+--eval set @user2_tid= $user2_tid;
+--enable_query_log
+
+--disable_warnings
+drop function if exists thread_id_name;
+--enable_warnings
+
+--delimiter //
+
+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;
+//
+
+delimiter ;//
+
+select thread_id_name(NULL);
+select thread_id_name(@user1_tid);
+select thread_id_name(@user2_tid);
+
+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\';";
+
+# reset lost counters
+truncate table performance_schema.events_statements_summary_by_digest;
+flush status;
+
+flush tables;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+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;
+
+# MDL lock granted immediately, no wait.
+SELECT * from t1 where id=1;
+
+--connection default
+
+echo "---- Marker 1 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con1
+
+# The MDL lock is now released
+COMMIT;
+
+--connection default
+
+echo "---- Marker 2 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con1
+
+BEGIN;
+
+# MDL lock is granted immediately, no wait
+UPDATE t1 set b="new value" where id=2;
+
+--connection default
+
+echo "---- Marker 3 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con2
+
+BEGIN;
+
+# MDL lock is PENDING : waiting for the update transaction
+--send DROP TABLE t1;
+
+--connection default
+
+# Wait for the DROP TABLE t1 to block
+let $wait_condition=
+  select count(*) = 1 from performance_schema.events_waits_current
+  where event_name = 'wait/lock/metadata/sql/mdl'
+  and object_name = 't1';
+--source include/wait_condition.inc
+
+echo "---- Marker 4 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con1
+
+# MDL lock on the update is released,
+# MDL pending lock is granted for the drop table, then released.
+COMMIT;
+
+--connection con2
+
+# complete DROP TABLE t1
+--reap
+
+--connection default
+
+echo "---- Marker 5 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--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
+
+# Get MDL read lock
+LOCK TABLE t1 READ;
+
+--connection default
+
+echo "---- Marker 6 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con2
+
+# User1 has a READ LOCK
+# User2 waiting for WRITE LOCK
+--send LOCK TABLE t1 write;
+
+--connection default
+
+# Wait for the LOCK TABLE t1 write to block
+let $wait_condition=
+  select count(*) = 1 from performance_schema.events_waits_current
+  where event_name = 'wait/lock/metadata/sql/mdl'
+  and object_name = 't1';
+--source include/wait_condition.inc
+
+echo "---- Marker 7 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con1
+
+# User1 releases a READ LOCK
+# User2 granted a WRITE LOCK
+UNLOCK TABLES;
+
+--connection con2
+
+# Complete LOCK TABLE t1 write
+--reap
+
+--connection default
+
+echo "---- Marker 8 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con1
+
+# User2 granted a WRITE LOCK
+# User1 waits for a READ LOCK
+--send LOCK TABLES t1 read;
+
+--connection default
+
+# Wait for the LOCK TABLES t1 READ to block
+let $wait_condition=
+  select count(*) = 1 from performance_schema.events_waits_current
+  where event_name = 'wait/lock/metadata/sql/mdl'
+  and object_name = 't1';
+--source include/wait_condition.inc
+
+echo "---- Marker 9 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con2
+
+UNLOCK TABLES;
+
+--connection con1
+
+# Complete LOCK TABLE t1 read
+--reap
+
+--connection default
+
+echo "---- Marker 10 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con1
+
+UNLOCK TABLES;
+
+--connection default
+
+echo "---- Marker 11 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+
+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;
+
+# MDL lock is granted immediately, no wait
+UPDATE LOW_PRIORITY t1 SET a=8;
+
+--connection default
+
+echo "---- Marker 12 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--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);
+
+--connection default
+
+echo "---- Marker 13 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con2
+
+--send SELECT GET_LOCK('test', 120);
+
+--connection default
+
+let $wait_condition=
+  select count(*) = 1 from performance_schema.events_waits_current
+  where event_name = 'wait/lock/metadata/sql/mdl'
+  and object_name = 'test';
+--source include/wait_condition.inc
+
+echo "---- Marker 14 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con1
+
+SELECT RELEASE_LOCK('test');
+
+--connection con2
+
+--reap
+
+--connection default
+
+echo "---- Marker 15 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+--connection con2
+
+SELECT RELEASE_LOCK('test');
+
+--connection default
+
+echo "---- Marker 16 ----";
+
+--vertical_results
+execute dump_metadata_locks;
+execute dump_table_handles;
+execute dump_waits_current;
+execute dump_waits_history_long;
+--horizontal_results
+
+# Cleanup
+
+--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';
+
+# In case of failure, will indicate the root cause
+show global status like "performance_schema%";
+
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate-master.opt
new file mode 100644
index 00000000000..cd2044483ef
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate-master.opt
@@ -0,0 +1 @@
+--query_cache_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate.test b/mysql-test/suite/perfschema/t/memory_aggregate.test
new file mode 100644
index 00000000000..a77dae2a65f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate.test
@@ -0,0 +1,7 @@
+# Tests for the performance schema
+#
+--source include/have_64bit.inc
+--source ../include/memory_aggregate_setup.inc
+--source ../include/memory_aggregate_load.inc
+--source ../include/memory_aggregate_cleanup.inc
+
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_32bit-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_32bit-master.opt
new file mode 100644
index 00000000000..cd2044483ef
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_32bit-master.opt
@@ -0,0 +1 @@
+--query_cache_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_32bit.test b/mysql-test/suite/perfschema/t/memory_aggregate_32bit.test
new file mode 100644
index 00000000000..abd16212acc
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_32bit.test
@@ -0,0 +1,7 @@
+# Tests for the performance schema
+#
+--source include/have_32bit.inc
+--source ../include/memory_aggregate_setup.inc
+--source ../include/memory_aggregate_load.inc
+--source ../include/memory_aggregate_cleanup.inc
+
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_a-master.opt
new file mode 100644
index 00000000000..0cdab7054d8
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a-master.opt
@@ -0,0 +1,2 @@
+--query_cache_size=0
+--loose-performance_schema_accounts_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a.test b/mysql-test/suite/perfschema/t/memory_aggregate_no_a.test
new file mode 100644
index 00000000000..a77dae2a65f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a.test
@@ -0,0 +1,7 @@
+# Tests for the performance schema
+#
+--source include/have_64bit.inc
+--source ../include/memory_aggregate_setup.inc
+--source ../include/memory_aggregate_load.inc
+--source ../include/memory_aggregate_cleanup.inc
+
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_h-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_h-master.opt
new file mode 100644
index 00000000000..30b8ed74c88
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_h-master.opt
@@ -0,0 +1,3 @@
+--query_cache_size=0
+--loose-performance_schema_accounts_size=0
+--loose-performance_schema_hosts_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_h.test b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_h.test
new file mode 100644
index 00000000000..a77dae2a65f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_h.test
@@ -0,0 +1,7 @@
+# Tests for the performance schema
+#
+--source include/have_64bit.inc
+--source ../include/memory_aggregate_setup.inc
+--source ../include/memory_aggregate_load.inc
+--source ../include/memory_aggregate_cleanup.inc
+
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u-master.opt
new file mode 100644
index 00000000000..b0629a513c0
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u-master.opt
@@ -0,0 +1,3 @@
+--query_cache_size=0
+--loose-performance_schema_accounts_size=0
+--loose-performance_schema_users_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u.test b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u.test
new file mode 100644
index 00000000000..a77dae2a65f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u.test
@@ -0,0 +1,7 @@
+# Tests for the performance schema
+#
+--source include/have_64bit.inc
+--source ../include/memory_aggregate_setup.inc
+--source ../include/memory_aggregate_load.inc
+--source ../include/memory_aggregate_cleanup.inc
+
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u_no_h-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u_no_h-master.opt
new file mode 100644
index 00000000000..89df63a3251
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u_no_h-master.opt
@@ -0,0 +1,4 @@
+--query_cache_size=0
+--loose-performance_schema_accounts_size=0
+--loose-performance_schema_users_size=0
+--loose-performance_schema_hosts_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u_no_h.test b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u_no_h.test
new file mode 100644
index 00000000000..a77dae2a65f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_a_no_u_no_h.test
@@ -0,0 +1,7 @@
+# Tests for the performance schema
+#
+--source include/have_64bit.inc
+--source ../include/memory_aggregate_setup.inc
+--source ../include/memory_aggregate_load.inc
+--source ../include/memory_aggregate_cleanup.inc
+
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_h-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_h-master.opt
new file mode 100644
index 00000000000..d630f88b87a
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_h-master.opt
@@ -0,0 +1,2 @@
+--query_cache_size=0
+--loose-performance_schema_hosts_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_h.test b/mysql-test/suite/perfschema/t/memory_aggregate_no_h.test
new file mode 100644
index 00000000000..a77dae2a65f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_h.test
@@ -0,0 +1,7 @@
+# Tests for the performance schema
+#
+--source include/have_64bit.inc
+--source ../include/memory_aggregate_setup.inc
+--source ../include/memory_aggregate_load.inc
+--source ../include/memory_aggregate_cleanup.inc
+
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_u-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_u-master.opt
new file mode 100644
index 00000000000..0d4faa03cd1
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_u-master.opt
@@ -0,0 +1,2 @@
+--query_cache_size=0
+--loose-performance_schema_users_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_u.test b/mysql-test/suite/perfschema/t/memory_aggregate_no_u.test
new file mode 100644
index 00000000000..a77dae2a65f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_u.test
@@ -0,0 +1,7 @@
+# Tests for the performance schema
+#
+--source include/have_64bit.inc
+--source ../include/memory_aggregate_setup.inc
+--source ../include/memory_aggregate_load.inc
+--source ../include/memory_aggregate_cleanup.inc
+
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_u_no_h-master.opt b/mysql-test/suite/perfschema/t/memory_aggregate_no_u_no_h-master.opt
new file mode 100644
index 00000000000..2a23af9d390
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_u_no_h-master.opt
@@ -0,0 +1,3 @@
+--query_cache_size=0
+--loose-performance_schema_users_size=0
+--loose-performance_schema_hosts_size=0
diff --git a/mysql-test/suite/perfschema/t/memory_aggregate_no_u_no_h.test b/mysql-test/suite/perfschema/t/memory_aggregate_no_u_no_h.test
new file mode 100644
index 00000000000..a77dae2a65f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/memory_aggregate_no_u_no_h.test
@@ -0,0 +1,7 @@
+# Tests for the performance schema
+#
+--source include/have_64bit.inc
+--source ../include/memory_aggregate_setup.inc
+--source ../include/memory_aggregate_load.inc
+--source ../include/memory_aggregate_cleanup.inc
+
diff --git a/mysql-test/suite/perfschema/t/misc.test b/mysql-test/suite/perfschema/t/misc.test
index 80ce64f0302..848be3beea1 100644
--- a/mysql-test/suite/perfschema/t/misc.test
+++ b/mysql-test/suite/perfschema/t/misc.test
@@ -156,7 +156,7 @@ DELETE FROM t_60905 WHERE i = 1;
 # should delete with a full scan (5 NULL fetch, 1 NULL delete)
 DELETE FROM t_60905 WHERE j = 8;
 
-# show the instrument data
+# show the instrument data.
 SELECT object_schema,
        object_name,
        index_name,
@@ -170,6 +170,23 @@ SELECT object_schema,
 
 DROP TABLE t_60905;
 
+#
+# Bug#71278 NUMBER OF ROWS IN PERFORMANCE SCHEMA TABLES
+#
+
+show global variables like "performance_schema_max_thread_instances";
+explain select * from performance_schema.threads;
+
+#
+# Bug #73082 SHOW EVENTS in performance_schema gives Access Denied
+#
+
+use performance_schema;
+show events;
+show events from performance_schema;
+show events where Db= 'performance_schema';
+use test;
+
 
 #
 # Bug#11929832 - EVENTS_STATEMENTS_HISTORY HAS ERRORS=0 WHEN THERE ARE ERRORS
@@ -187,7 +204,7 @@ select * from t1;
 select mysql_errno, returned_sqlstate, message_text, errors, warnings
   from performance_schema.events_statements_history where errors > 0;
   
---echo
+--echo #
 select mysql_errno, returned_sqlstate, message_text, errors, warnings from 
   performance_schema.events_statements_history_long where errors > 0;
 
@@ -270,3 +287,14 @@ enable_query_log;
 # an unexpected refcount.
 FLUSH TABLE t0;
 DROP TABLE t0;
+
+--echo #
+--echo # MDEV-24364 Alter rename table does not remove PFS share
+--echo #
+create or replace table yt4 (x int) engine innodb;
+alter table yt4 rename to t1, algorithm=copy;
+drop tables t1;
+
+select object_type, object_schema, object_name
+from performance_schema.objects_summary_global_by_type
+where object_schema="test";
diff --git a/mysql-test/suite/perfschema/t/myisam_file_io.test b/mysql-test/suite/perfschema/t/myisam_file_io.test
index 3b6a1369ab5..96f24d8a835 100644
--- a/mysql-test/suite/perfschema/t/myisam_file_io.test
+++ b/mysql-test/suite/perfschema/t/myisam_file_io.test
@@ -51,7 +51,7 @@ select event_name,
   order by thread_id, event_id;
 
 # In case of failures, this will tell if file io are lost.
-show status like 'performance_schema_%';
+show global status like 'performance_schema_%';
 
 # Cleanup
 
diff --git a/mysql-test/suite/perfschema/t/nesting.test b/mysql-test/suite/perfschema/t/nesting.test
index 6144d0ff6d3..ee1581c284b 100644
--- a/mysql-test/suite/perfschema/t/nesting.test
+++ b/mysql-test/suite/perfschema/t/nesting.test
@@ -1,5 +1,8 @@
 # Test to check the proper nesting of events
 
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+#-- source include/have_QC_Disabled.inc
+
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 # On windows, the socket instrumentation collects an extra "opt"
@@ -42,6 +45,7 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES'
                  'wait/synch/rwlock/sql/LOCK_grant',
                  'wait/synch/mutex/sql/THD::LOCK_thd_data',
                  'wait/synch/mutex/sql/THD::LOCK_thd_kill',
+                 'wait/synch/mutex/sql/THD::LOCK_thd_query',
                  'wait/io/file/sql/query_log');
 
 update performance_schema.setup_instruments set enabled='YES', timed='YES'
@@ -107,7 +111,7 @@ set @marker_end = (select end_event_id from performance_schema.events_statements
 select (@marker_end is not null) as expected;
 
 # Will point to what happened on spurious test failures
-show status like "performance_schema%";
+show global status like "performance_schema%";
 
 #
 # This is the test itself:
@@ -185,5 +189,3 @@ update performance_schema.threads set instrumented='YES';
 update performance_schema.setup_instruments set enabled='YES', timed='YES';
 
 --enable_query_log
-
-
diff --git a/mysql-test/suite/perfschema/t/no_threads-master.opt b/mysql-test/suite/perfschema/t/no_threads-master.opt
index 64275d009d4..eea71a77864 100644
--- a/mysql-test/suite/perfschema/t/no_threads-master.opt
+++ b/mysql-test/suite/perfschema/t/no_threads-master.opt
@@ -1 +1,5 @@
---thread-handling=no-threads --loose-performance-schema-max-thread_instances=10 --default-storage-engine=MyISAM --skip-innodb
+--thread-handling=no-threads
+--loose-performance-schema-max-thread_instances=50
+--default-storage-engine=MyISAM
+--default-tmp-storage-engine=MyISAM
+--loose-skip-innodb
diff --git a/mysql-test/suite/perfschema/t/no_threads.test b/mysql-test/suite/perfschema/t/no_threads.test
index ee745bd87b0..b7b8767f1cc 100644
--- a/mysql-test/suite/perfschema/t/no_threads.test
+++ b/mysql-test/suite/perfschema/t/no_threads.test
@@ -2,7 +2,6 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
---source include/not_threadpool.inc
 
 
 # Setup : in this main thread
@@ -20,14 +19,17 @@ 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";
+
+# Make sure no thread instrumentation is lost
+show status like "Performance_schema_thread_instances_lost";
 
 # Code to test : in this main thread
 
 create table test.t1(a int) engine=MYISAM;
 
-show variables like "performance_schema";
-show variables like "performance_schema_max_thread%";
+show global variables like "performance_schema";
+show global variables like "performance_schema_max_thread%";
 
 # Verification : in this main thread
 
diff --git a/mysql-test/suite/perfschema/t/one_thread_per_con.test b/mysql-test/suite/perfschema/t/one_thread_per_con.test
index 6aeec55dbb5..11a203a12e5 100644
--- a/mysql-test/suite/perfschema/t/one_thread_per_con.test
+++ b/mysql-test/suite/perfschema/t/one_thread_per_con.test
@@ -2,7 +2,6 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
---source include/not_threadpool.inc
 
 # Setup
 
@@ -24,7 +23,7 @@ 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";
 
 # Code to test
 
diff --git a/mysql-test/suite/perfschema/t/ortho_iter.test b/mysql-test/suite/perfschema/t/ortho_iter.test
index f7e68538906..fe1d916b6a0 100644
--- a/mysql-test/suite/perfschema/t/ortho_iter.test
+++ b/mysql-test/suite/perfschema/t/ortho_iter.test
@@ -3,6 +3,7 @@
 # for every table and instruments.
 
 --source include/not_embedded.inc
+--source include/no_valgrind_without_big.inc
 --source include/have_perfschema.inc
 
 --disable_warnings
@@ -13,17 +14,39 @@ drop procedure if exists check_instrument;
 truncate table performance_schema.events_statements_summary_by_digest;
 flush status;
 
+# Print known global memory instruments (PSI_FLAG_GLOBAL),
+# see maintenance of count_global_expected below.
+
+# --echo "Known PSI_FLAG_GLOBAL memory instruments"
+# select name from performance_schema.setup_instruments
+#   where (name like "memory/%")
+#   and (name not like "memory/performance_schema/%")
+#   and (name not in
+#     (select event_name from
+#       performance_schema.memory_summary_by_account_by_event_name));
+
 delimiter $;
 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);
@@ -35,23 +58,59 @@ begin
   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 like "memory/%") into is_memory;
+  select (instr_name like "transaction") into is_transaction;
 
-  select instr_name, is_wait, is_stage, is_statement;
+  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 \"",
@@ -63,8 +122,25 @@ begin
     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;
@@ -79,40 +155,112 @@ begin
                              ", 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
-        set msg= concat("Missing wait events: ", msg_detail);
-        signal sqlstate '05000' set message_text= msg;
+        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_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;
       end if;
 
-      if is_wait = 1 and is_wait_table = 0 and @count_actual <> 0
+      if is_wait_file = 1
       then
-        set msg= concat("Unexpected wait events: ", msg_detail);
-        signal sqlstate '05000' set message_text= msg;
+        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_stage = 1 and is_stage_table = 1 and @count_actual <> count_expected
+      if is_wait_socket = 1
       then
-        set msg= concat("Missing stage events: ", msg_detail);
-        signal sqlstate '05000' set message_text= msg;
+        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 and is_stage_table = 0 and @count_actual <> 0
+      if is_stage = 1
       then
-        set msg= concat("Unexpected stage events: ", msg_detail);
-        signal sqlstate '05000' set message_text= msg;
+        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_table = 0 and @count_actual <> 0
+        then
+          set msg= concat("Unexpected stage events: ", msg_detail);
+          signal sqlstate '05000' set message_text= msg;
+        end if;
       end if;
 
-      if is_statement = 1 and is_statement_table = 1 and @count_actual <> count_expected
+      if is_statement = 1
       then
-        set msg= concat("Missing statement events: ", msg_detail);
-        signal sqlstate '05000' set message_text= msg;
+        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_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_statement = 1 and is_statement_table = 0 and @count_actual <> 0
+      if is_transaction = 1
       then
-        set msg= concat("Unexpected statement events: ", msg_detail);
-        signal sqlstate '05000' set message_text= msg;
+        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;
@@ -127,16 +275,15 @@ $
 delimiter ;$
 
 # Check the configuration is ok
-show variables where
-    `Variable_name` != "performance_schema_max_statement_classes" and
-    `Variable_name` like "performance_schema%";
+show global variables like "performance_schema%";
 
 call check_instrument("wait/synch/mutex/");
 call check_instrument("wait/synch/rwlock/");
+call check_instrument("wait/synch/sxlock/");
 call check_instrument("wait/synch/cond/");
 call check_instrument("wait/synch/");
 call check_instrument("wait/io/file/");
-call check_instrument("wait/io/net/");
+call check_instrument("wait/io/socket/");
 call check_instrument("wait/io/table/");
 call check_instrument("wait/io/");
 call check_instrument("wait/lock/table/");
@@ -147,8 +294,10 @@ call check_instrument("statement/com/");
 call check_instrument("statement/sql/");
 call check_instrument("statement/abstract/");
 call check_instrument("statement/");
-call check_instrument("idle/io/socket");
-call check_instrument("idle/");
+call check_instrument("idle");
+call check_instrument("memory/");
+call check_instrument("memory/performance_schema/");
+call check_instrument("transaction");
 
 drop procedure check_instrument;
 
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_event-master.opt b/mysql-test/suite/perfschema/t/pfs_upgrade_event-master.opt
new file mode 100644
index 00000000000..275a585d298
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_event-master.opt
@@ -0,0 +1,2 @@
+--general_log=0
+--slow_query_log=0
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_event.test b/mysql-test/suite/perfschema/t/pfs_upgrade_event.test
index f16a073f212..809e5e05827 100644
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_event.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_event.test
@@ -9,7 +9,7 @@
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---echo "Testing mysql_upgrade with EVENT performance_schema.user_event"
+--echo # Testing mysql_upgrade with EVENT performance_schema.user_event
 
 create event test.user_event on schedule every 1 day do
   select "not supposed to be here";
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_func-master.opt b/mysql-test/suite/perfschema/t/pfs_upgrade_func-master.opt
new file mode 100644
index 00000000000..275a585d298
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_func-master.opt
@@ -0,0 +1,2 @@
+--general_log=0
+--slow_query_log=0
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_func.test b/mysql-test/suite/perfschema/t/pfs_upgrade_func.test
index da2bc371308..8f3a1c0ea26 100644
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_func.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_func.test
@@ -9,7 +9,7 @@
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---echo "Testing mysql_upgrade with FUNCTION performance_schema.user_func"
+--echo # Testing mysql_upgrade with FUNCTION performance_schema.user_func
 
 create function test.user_func() returns integer
   return 0;
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_proc-master.opt b/mysql-test/suite/perfschema/t/pfs_upgrade_proc-master.opt
new file mode 100644
index 00000000000..275a585d298
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_proc-master.opt
@@ -0,0 +1,2 @@
+--general_log=0
+--slow_query_log=0
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test b/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test
index 99e0816ccbd..692507348e8 100644
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_proc.test
@@ -9,7 +9,7 @@
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---echo "Testing mysql_upgrade with PROCEDURE performance_schema.user_proc"
+--echo # Testing mysql_upgrade with PROCEDURE performance_schema.user_proc
 
 create procedure test.user_proc()
   select "Not supposed to be here";
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_table-master.opt b/mysql-test/suite/perfschema/t/pfs_upgrade_table-master.opt
new file mode 100644
index 00000000000..275a585d298
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_table-master.opt
@@ -0,0 +1,2 @@
+--general_log=0
+--slow_query_log=0
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_table.test b/mysql-test/suite/perfschema/t/pfs_upgrade_table.test
index 897ec23c552..8c69f0055f2 100644
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_table.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_table.test
@@ -9,7 +9,7 @@
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---echo "Testing mysql_upgrade with TABLE performance_schema.user_table"
+--echo # Testing mysql_upgrade with TABLE performance_schema.user_table
 
 create table test.user_table(a int);
 
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_view-master.opt b/mysql-test/suite/perfschema/t/pfs_upgrade_view-master.opt
new file mode 100644
index 00000000000..275a585d298
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_view-master.opt
@@ -0,0 +1,2 @@
+--general_log=0
+--slow_query_log=0
diff --git a/mysql-test/suite/perfschema/t/pfs_upgrade_view.test b/mysql-test/suite/perfschema/t/pfs_upgrade_view.test
index 0c9af73a1d4..57a7cad2ac6 100644
--- a/mysql-test/suite/perfschema/t/pfs_upgrade_view.test
+++ b/mysql-test/suite/perfschema/t/pfs_upgrade_view.test
@@ -9,7 +9,7 @@
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---echo "Testing mysql_upgrade with VIEW performance_schema.user_view"
+--echo # Testing mysql_upgrade with VIEW performance_schema.user_view
 
 create view test.user_view as select "Not supposed to be here";
 
diff --git a/mysql-test/suite/perfschema/t/pool_of_threads-master.opt b/mysql-test/suite/perfschema/t/pool_of_threads-master.opt
deleted file mode 100644
index 75a5cd77203..00000000000
--- a/mysql-test/suite/perfschema/t/pool_of_threads-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---loose-pool-of-threads
diff --git a/mysql-test/suite/perfschema/t/prepared_statements.test b/mysql-test/suite/perfschema/t/prepared_statements.test
new file mode 100644
index 00000000000..75d10238ac1
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/prepared_statements.test
@@ -0,0 +1,210 @@
+# Test for prepared statement instrumentation 
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+
+CREATE DATABASE db;
+USE db;
+
+--let $psi_select =  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 
+--let $psi_truncate =  TRUNCATE TABLE performance_schema.prepared_statements_instances 
+--let $eshl_select = SELECT EVENT_NAME, SQL_TEXT, OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME FROM performance_schema.events_statements_history_long WHERE CURRENT_SCHEMA='db' 
+--let $eshl_truncate = TRUNCATE TABLE performance_schema.events_statements_history_long 
+
+--eval $psi_truncate
+--eval $eshl_truncate 
+
+--source suite/perfschema/include/prepared_stmts_setup.inc
+
+--vertical_results
+--eval $psi_select
+--eval $eshl_select
+--horizontal_results
+
+--source suite/perfschema/include/prepared_stmts_execution.inc 
+
+--vertical_results
+--eval $psi_select
+--eval $eshl_select
+--horizontal_results
+
+# Truncate to reset the statistics
+--eval $psi_truncate
+
+# check whether the statistics are reset
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+--source suite/perfschema/include/prepared_stmts_deallocation.inc
+
+--vertical_results
+# select query on prepared_statements_instances table must return empty set
+--eval $psi_select
+--eval $eshl_select
+--horizontal_results
+
+# truncate
+--eval $eshl_truncate
+
+#
+# Test to check the instrumentation of prepared statements 
+# when all consumers in setup_consumers are disabled.
+# 
+
+# Disable all consumers
+UPDATE performance_schema.setup_consumers SET ENABLED = 'NO';
+
+--source  suite/perfschema/include/prepared_stmts_setup.inc
+
+--vertical_results
+--eval $psi_select
+--eval $eshl_select
+--horizontal_results
+
+--source suite/perfschema/include/prepared_stmts_execution.inc
+
+--vertical_results
+--eval $psi_select
+--eval $eshl_select
+--horizontal_results
+
+--source suite/perfschema/include/prepared_stmts_deallocation.inc
+
+--vertical_results
+--eval $psi_select
+--eval $eshl_select
+--horizontal_results
+
+# truncate
+--eval $eshl_truncate
+
+# restore the initial set-up of consumers table
+UPDATE performance_schema.setup_consumers SET ENABLED = 'YES';
+
+#
+# Aggregation 
+#
+
+PREPARE st FROM 'SELECT SUM(1000 + ?) AS total';
+
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+SET @d=100;
+EXECUTE st USING @d;
+
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+let $i=5;
+while($i)
+{ 
+  SET @d = @d + 100;
+  EXECUTE st USING @d;
+  --vertical_results
+  --eval $psi_select
+  --horizontal_results
+  dec $i;  
+}
+
+# truncate 
+--eval $psi_truncate
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+#
+# check whether the instrumented prepared statement is removed from the 
+# prepared_statement_instances table after de allocation of the prepared
+# statement even if instrumentation is disabled
+#
+
+# Disable prepared statement instrumentation
+UPDATE performance_schema.setup_instruments SET ENABLED = 'NO' 
+       WHERE NAME like "statement/sql/execute%";
+
+SET @d=3274;
+# COUNT_EXECUTE should remain 0. No increment must be seen.
+EXECUTE st USING @d;
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+UPDATE performance_schema.setup_instruments SET ENABLED = 'NO'
+       WHERE NAME like "statement/sql/prepare%";
+
+DEALLOCATE PREPARE st;
+# should return empty set.
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+# Restore back teh initial set-up of setup_instruments table 
+
+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%";
+
+
+# Reprepare
+
+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';
+
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+EXECUTE st;
+
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+ALTER TABLE tab DROP COLUMN age;
+
+EXECUTE st;
+
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+ALTER TABLE tab ADD COLUMN age INT NULL;
+
+EXECUTE st;
+
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+# check if the statistics are reset 
+--eval $psi_truncate
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+DEALLOCATE PREPARE st;
+
+--vertical_results
+--eval $psi_select
+--horizontal_results
+
+# clean up
+# truncate
+--eval $psi_truncate 
+--eval $eshl_truncate
+
+DROP TABLE tab;
+DROP DATABASE db;
diff --git a/mysql-test/suite/perfschema/t/prepared_stmts_by_stored_programs.test b/mysql-test/suite/perfschema/t/prepared_stmts_by_stored_programs.test
new file mode 100644
index 00000000000..bf81d036c2d
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/prepared_stmts_by_stored_programs.test
@@ -0,0 +1,151 @@
+# Test to check instrumentation of prepared statements created by 
+# stored programs. SQL prepared statements (PREPARE, EXECUTE, DEALLOCATE PREPARE) 
+# can be used in stored procedures, but not stored functions or triggers.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+
+--let $psi_select = SELECT STATEMENT_NAME, SQL_TEXT, COUNT_EXECUTE, COUNT_REPREPARE, OWNER_OBJECT_TYPE, OWNER_OBJECT_SCHEMA, OWNER_OBJECT_NAME FROM performance_schema.prepared_statements_instances
+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");
+INSERT INTO t VALUES (5,"manipuri","Guru");
+INSERT INTO t VALUES (6,"kathakali","Manavedan");
+SET sql_mode= default;
+# Stored Procedure
+DELIMITER |;
+CREATE PROCEDURE p1()
+BEGIN
+  PREPARE st FROM 'SELECT * FROM t WHERE a<=?' ;
+  SET @a=3;
+  EXECUTE st using @a;
+END|
+
+CALL p1()|
+--eval $psi_select
+
+DEALLOCATE PREPARE st|
+--eval $psi_select
+
+CREATE PROCEDURE p2()
+BEGIN
+  PREPARE st1 FROM 'INSERT INTO t SELECT * FROM t WHERE a<=?' ;
+END|
+
+CALL p2()|
+--eval $psi_select
+
+SET @a=4|
+EXECUTE st1 using @a|
+--eval $psi_select
+
+CREATE PROCEDURE p3()
+BEGIN
+  SET @a=2; 
+  EXECUTE st1 using @a;
+END|
+
+CALL p3()|
+--eval $psi_select
+
+DEALLOCATE PREPARE st1|
+--eval $psi_select
+
+PREPARE st2 FROM 'UPDATE t SET a=a+1 WHERE b=?'|
+--eval $psi_select
+
+CREATE PROCEDURE p4()
+BEGIN
+  SET @b='kuchipudi';
+  EXECUTE st2 USING @b;
+END|
+
+CALL p4()|
+--eval $psi_select
+
+ALTER TABLE t DROP COLUMN name;
+
+# COUNT_REPREPARE must be 1 
+CALL p4()|
+--eval $psi_select
+
+DEALLOCATE PREPARE st2|
+--eval $psi_select
+
+CREATE PROCEDURE p5()
+BEGIN
+  SET @a=1;
+  SELECT @a;
+END|
+
+PREPARE st3 FROM 'CALL p5()'|
+--eval $psi_select
+EXECUTE st3|
+--eval $psi_select
+DEALLOCATE PREPARE st3|
+--eval $psi_select
+
+DELIMITER ;| 
+
+# Events
+
+CREATE TABLE tab(a INT);
+
+SET GLOBAL event_scheduler=ON;
+
+DELIMITER |;
+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|
+
+DELIMITER ;|
+
+# Let e1 insert 1 records into the table tab
+
+--let $wait_condition= select count(*) >= 1 from tab
+--source include/wait_condition.inc
+SELECT * FROM tab LIMIT 1;
+
+# Wait till the  above one execution of event is instrumented.
+
+--let $wait_condition= select count_star >= 1 from performance_schema.events_statements_summary_by_program where object_type='EVENT'
+--source include/wait_condition.inc
+
+SET GLOBAL event_scheduler=OFF;
+--source include/no_running_event_scheduler.inc
+
+# The following should return empty set as the instrumented prepared statement
+# row is removed as de allocation of the statement happens automatically as 
+# event thread is cleaned up. 
+--eval $psi_select
+
+# clean-up
+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/t/privilege.test b/mysql-test/suite/perfschema/t/privilege.test
index 0e51d161934..a0af41e0372 100644
--- a/mysql-test/suite/perfschema/t/privilege.test
+++ b/mysql-test/suite/perfschema/t/privilege.test
@@ -336,3 +336,15 @@ UPDATE performance_schema.setup_consumers SET enabled = 'YES';
 UPDATE performance_schema.setup_timers SET timer_name = 'MICROSECOND' where name="idle";
 UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND'  where name="stage";
 UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND'  where name="statement";
+
+--echo #
+--echo # WL#2284: Increase the length of a user name
+--echo #
+
+CREATE USER 'user_name_len_22_01234'@localhost;
+
+--error ER_DBACCESS_DENIED_ERROR
+GRANT ALL ON performance_schema.* TO 'user_name_len_22_01234'@localhost with GRANT OPTION;
+
+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/t/privilege_table_io.test b/mysql-test/suite/perfschema/t/privilege_table_io.test
index a74805f5c7b..1265b03b503 100644
--- a/mysql-test/suite/perfschema/t/privilege_table_io.test
+++ b/mysql-test/suite/perfschema/t/privilege_table_io.test
@@ -40,10 +40,8 @@ insert into test.marker set a = 1;
 # This will not, the ACL cache is already loaded
 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 status like "performance_schema%";
+show global variables like "performance_schema%";
+show global status like "performance_schema%";
 # Stop recording events + pull results
 let $schema_to_dump= "test", "mysql";
 --source ../include/table_io_result_helper.inc
diff --git a/mysql-test/suite/perfschema/t/query_cache.test b/mysql-test/suite/perfschema/t/query_cache.test
index 4c130813611..d5e3008d3af 100644
--- a/mysql-test/suite/perfschema/t/query_cache.test
+++ b/mysql-test/suite/perfschema/t/query_cache.test
@@ -24,33 +24,33 @@ flush status;
 
 select * from t1;
 
-show status like "Qcache_queries_in_cache";
-show status like "Qcache_inserts";
-show status like "Qcache_hits";
+show global status like "Qcache_queries_in_cache";
+show global status like "Qcache_inserts";
+show global status like "Qcache_hits";
 
 select * from t1;
 
-show status like "Qcache_queries_in_cache";
-show status like "Qcache_inserts";
-show status like "Qcache_hits";
+show global status like "Qcache_queries_in_cache";
+show global status like "Qcache_inserts";
+show global status like "Qcache_hits";
 
 select spins from performance_schema.events_waits_current order by event_name limit 1;
 
 --replace_result CYCLE {CYCLE_OR_NANOSECOND} NANOSECOND {CYCLE_OR_NANOSECOND}
 select * from performance_schema.setup_timers where name='wait';
 
-show status like "Qcache_queries_in_cache";
-show status like "Qcache_inserts";
-show status like "Qcache_hits";
+show global status like "Qcache_queries_in_cache";
+show global status like "Qcache_inserts";
+show global status like "Qcache_hits";
 
 select spins from performance_schema.events_waits_current order by event_name limit 1;
 
 --replace_result CYCLE {CYCLE_OR_NANOSECOND} NANOSECOND {CYCLE_OR_NANOSECOND}
 select * from performance_schema.setup_timers where name='wait';
 
-show status like "Qcache_queries_in_cache";
-show status like "Qcache_inserts";
-show status like "Qcache_hits";
+show global status like "Qcache_queries_in_cache";
+show global status like "Qcache_inserts";
+show global status like "Qcache_hits";
 
 SET GLOBAL query_cache_size=@save_query_cache_size;
 
diff --git a/mysql-test/suite/perfschema/t/read_only.test b/mysql-test/suite/perfschema/t/read_only.test
index 0020c64937b..2d8e41595d1 100644
--- a/mysql-test/suite/perfschema/t/read_only.test
+++ b/mysql-test/suite/perfschema/t/read_only.test
@@ -6,6 +6,7 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+--enable_connect_log
 
 use performance_schema;
 
@@ -26,6 +27,7 @@ connection con1;
 select @@global.read_only;
 show grants;
 --disable_result_log
+--echo # 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';
@@ -49,7 +51,7 @@ 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;
diff --git a/mysql-test/suite/perfschema/t/rpl_group_member_stats.test b/mysql-test/suite/perfschema/t/rpl_group_member_stats.test
new file mode 100644
index 00000000000..256c6a69c26
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/rpl_group_member_stats.test
@@ -0,0 +1,48 @@
+# WL#6839 - GCS Replication: P_S table to show DBSM stats
+#
+# This test proofs the existence of the replication_group_member_stats table
+# and all its fields. Since the table only returns values if the plugin is
+# loaded, all queries will return "No such row" or "0"
+#
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--let $member_id= query_get_value(SELECT Member_Id from performance_schema.replication_group_member_stats, Member_Id, 1)
+--let $assert_text= The value of member_id should not be present
+--let $assert_cond= "$member_id" = "No such row"
+--source include/assert.inc
+
+--let $view_id= query_get_value(SELECT View_Id from performance_schema.replication_group_member_stats, View_Id, 1)
+--let $assert_text= The value of view_id should not be present
+--let $assert_cond= "$View_Id" = "No such row"
+--source include/assert.inc
+
+--let $transaction_in_queue= query_get_value(SELECT Count_Transactions_in_queue from performance_schema.replication_group_member_stats, Count_Transactions_in_queue, 1)
+--let $assert_text= The value of Count_Transactions_in_queue should be 0
+--let $assert_cond= "$transaction_in_queue" = 0
+--source include/assert.inc
+
+--let $certified_transactions= query_get_value(SELECT Count_Transactions_checked from performance_schema.replication_group_member_stats, Count_Transactions_checked, 1)
+--let $assert_text= The value of Count_Transactions_checked should be 0
+--let $assert_cond= "$certified_transactions" = 0
+--source include/assert.inc
+
+--let $negatively_certified= query_get_value(SELECT Count_conflicts_detected from performance_schema.replication_group_member_stats, Count_conflicts_detected, 1)
+--let $assert_text= The value of Count_conflicts_detected should be 0
+--let $assert_cond= "$negatively_certified" = 0
+--source include/assert.inc
+
+--let $certification_db_size= query_get_value(SELECT Count_Transactions_rows_validating from performance_schema.replication_group_member_stats, Count_Transactions_rows_validating, 1)
+--let $assert_text= The value of Count_Transactions_rows_validating should be 0
+--let $assert_cond= "$certification_db_size" = 0
+--source include/assert.inc
+
+--let $stable_set= query_get_value(SELECT Transactions_Committed_all_members from performance_schema.replication_group_member_stats, Transactions_Committed_all_members, 1)
+--let $assert_text= The value of Transactions_Committed_all_members should be 0
+--let $assert_cond= "$stable_set" = 0
+--source include/assert.inc
+
+--let $last_certified_transaction= query_get_value(SELECT Last_conflict_free_transaction from performance_schema.replication_group_member_stats, Last_conflict_free_transaction, 1)
+--let $assert_text= The value of Last_conflict_free_transaction should not be present
+--let $assert_cond= "$last_certified_transaction" = "No such row"
+--source include/assert.inc
diff --git a/mysql-test/suite/perfschema/t/rpl_group_members.test b/mysql-test/suite/perfschema/t/rpl_group_members.test
new file mode 100644
index 00000000000..e5dfde747f1
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/rpl_group_members.test
@@ -0,0 +1,33 @@
+# WL#6841 - GCS Replication: P_S table to show GCS kernel stats
+#
+# This test proofs the existence of the replication_connection_status table
+# and all its fields. Since the table only returns values if the plugin is
+# loaded, all queries will return "No such row" or "0"
+#
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--let $channel_name= query_get_value(SELECT Channel_Name from performance_schema.replication_group_members, Channel_Name, 1)
+--let $assert_text= The value of channel name should be empty
+--let $assert_cond= "$channel_name" = "No such row"
+--source include/assert.inc
+
+--let $member_id= query_get_value(SELECT Member_Id from performance_schema.replication_group_members, Member_Id, 1)
+--let $assert_text= The value of member_id should be empty
+--let $assert_cond= "$member_id" = "No such row"
+--source include/assert.inc
+
+--let $member_host= query_get_value(SELECT Member_Host from performance_schema.replication_group_members, Member_Host, 1)
+--let $assert_text= The value of member_host should be empty
+--let $assert_cond= "$member_host" = "No such row"
+--source include/assert.inc
+
+--let $member_port= query_get_value(SELECT Member_Port from performance_schema.replication_group_members, Member_Port, 1)
+--let $assert_text= The value of member_port should be empty
+--let $assert_cond= "$member_port" = "No such row"
+--source include/assert.inc
+
+--let $member_state= query_get_value(SELECT Member_State from performance_schema.replication_group_members, Member_State, 1)
+--let $assert_text= The value of member_state should be empty
+--let $assert_cond= "$member_state" = "No such row"
+--source include/assert.inc
diff --git a/mysql-test/suite/perfschema/t/rpl_gtid_func.test b/mysql-test/suite/perfschema/t/rpl_gtid_func.test
index 048dbca0576..ffa58b27d4b 100644
--- a/mysql-test/suite/perfschema/t/rpl_gtid_func.test
+++ b/mysql-test/suite/perfschema/t/rpl_gtid_func.test
@@ -32,7 +32,7 @@ update performance_schema.setup_instruments
 connection master;
 
 select * from performance_schema.setup_instruments
-  where timed='NO';
+  where timed='NO' and name not like "memory/%";
 
 select "This better be in the master" as in_master_digest;
 
diff --git a/mysql-test/suite/perfschema/t/rpl_statements.test b/mysql-test/suite/perfschema/t/rpl_statements.test
index a4604e7904c..c97cd61941c 100644
--- a/mysql-test/suite/perfschema/t/rpl_statements.test
+++ b/mysql-test/suite/perfschema/t/rpl_statements.test
@@ -49,18 +49,18 @@ let $column_list=
 # Define instrument name for enable/disable instruments
 let $pfs_instrument='%statement/%';
 
---echo
+--echo #
 --echo #
 --echo # STEP 1 - CREATE AND REPLICATE TEST TABLES
 --echo #
 
 connection master;
 
---echo
---echo *** Create test tables
---echo
+--echo #
+--echo # *** Create test tables
+--echo #
 
-show variables like 'binlog_format%';
+show global variables like 'binlog_format%';
 
 --disable_warnings
 drop table if exists test.marker;
@@ -72,26 +72,26 @@ create table test.marker(s1 int) engine=innodb;
 
 sync_slave_with_master;
 
---echo
---echo *** Clear statement events
+--echo #
+--echo # *** Clear statement events
 --source ../include/rpl_statements_truncate.inc
 
---echo
+--echo #
 --echo #
 --echo # STEP 2 - REPLICATE ONE ROW ON MASTER TO GET REPLICATION THREAD ID ON SLAVE
 --echo #
 
 connection master;
 
---echo
+--echo #
 insert into test.marker values (0);
---echo
+--echo #
 
 sync_slave_with_master;
 
---echo
---echo *** Verify row, get replication thread id, clear statement events
---echo
+--echo #
+--echo # *** Verify row, get replication thread id, clear statement events
+--echo #
 
 # TODO: Get slave thread id from threads using thread/sql/slave_sql event name
 
@@ -99,82 +99,82 @@ select thread_id into @slave_thread_id from performance_schema.events_statements
   where sql_text like '%marker%';
 let $slave_thread_id= `select @slave_thread_id`;
 
---echo *** Verify row inserted on master was replicated
+--echo # *** Verify row inserted on master was replicated
 select count(*) = 1 as 'Expect 1' from test.marker;
 
---echo *** Clear statement events
+--echo # *** Clear statement events
 --source ../include/rpl_statements_truncate.inc
 
---echo
+--echo #
 --echo #
 --echo # STEP 3 - PERFORM DML STATEMENTS ON MASTER
 --echo #
 
 connection master;
 
---echo
-show variables like 'binlog_format%';
+--echo #
+show global variables like 'binlog_format%';
 
---echo *** Clear statement events
+--echo # *** Clear statement events
 --source ../include/rpl_statements_truncate.inc
 
---echo
---echo *** Create/drop table, create/drop database
---echo
+--echo #
+--echo # *** Create/drop table, create/drop database
+--echo #
 create database marker1_db;
 create database marker2_db;
 create table marker1_db.table1 (s1 int) engine=innodb;
 create table marker2_db.table1 (s1 int) engine=innodb;
 create table marker2_db.table2 (s1 int) engine=innodb;
 
---echo
---echo *** Transaction
+--echo #
+--echo # *** Transaction
 start transaction;
 insert into marker1_db.table1 values (1), (2), (3);
 insert into marker2_db.table1 values (1), (2), (3);
 commit;
 
---echo
---echo *** Alter
+--echo #
+--echo # *** Alter
 alter table marker1_db.table1 add column (s2 varchar(32));
 
---echo
---echo *** Insert, Update
+--echo #
+--echo # *** Insert, Update
 start transaction;
 insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six');
 update marker1_db.table1 set s1 = s1 + 1;
 commit;
 
---echo
---echo *** Rollback
+--echo #
+--echo # *** Rollback
 start transaction;
 insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine');
 rollback;
 
---echo
---echo *** Autocommit, Delete, Drop
+--echo #
+--echo # *** Autocommit, Delete, Drop
 delete from marker1_db.table1 where s1 > 4;
 drop table marker2_db.table1;
 drop database marker2_db;
 
 --source ../include/disable_instruments.inc
 
---echo
---echo *** Examine statements events that will be compared on the slave
---echo
+--echo #
+--echo # *** Examine statements events that will be compared on the slave
+--echo #
 
 --replace_column 1 [THREAD_ID] 2 [EVENT_ID]
 
 eval select $column_list from performance_schema.events_statements_history_long
   where sql_text like '%marker%' order by event_id;
 
---echo
+--echo #
 --echo #
 --echo # STEP 4 - REPLICATE STATEMENT EVENTS ON MASTER TO SLAVE
 --echo #
---echo
---echo *** Store statement events in holding table, then replicate
---echo
+--echo #
+--echo # *** Store statement events in holding table, then replicate
+--echo #
 
 --source ../include/disable_instruments.inc
 
@@ -189,7 +189,7 @@ create table test.master_events_statements_history_long as
 
 --source ../include/enable_instruments.inc
 
---echo
+--echo #
 --echo #
 --echo # STEP 5 - VERIFY DML AND DDL STATEMENT EVENTS ON SLAVE
 --echo #
@@ -198,24 +198,24 @@ sync_slave_with_master;
 
 --source ../include/disable_instruments.inc
 
---echo
---echo *** List statement events from master
---echo
+--echo #
+--echo # *** List statement events from master
+--echo #
 --replace_column 1 [THREAD_ID] 2 [EVENT_ID]
 eval select $column_list from master_events_statements_history_long order by event_id;
 
---echo
---echo *** List statement events on slave
---echo
+--echo #
+--echo # *** List statement events on slave
+--echo #
 
 --replace_column 1 [THREAD_ID] 2 [EVENT_ID]
 
 eval select $column_list from performance_schema.events_statements_history_long
   where thread_id = @slave_thread_id and sql_text like '%marker%' order by event_id;
 
---echo
---echo *** Compare master and slave events
---echo
+--echo #
+--echo # *** Compare master and slave events
+--echo #
 
 # Note: The statement digest provides a more robust comparison than the
 # event name. However, in some cases, e.g. DROP TABLE, the server generates
@@ -224,7 +224,7 @@ eval select $column_list from performance_schema.events_statements_history_long
 # statements, so we use both methods to ensure coverage.
 
 --echo 
---echo *** Event name comparison - expect 0 mismatches
+--echo # *** Event name comparison - expect 0 mismatches
 --echo 
 
 select thread_id, event_id, event_name, digest_text, sql_text from performance_schema.events_statements_history_long t1
@@ -233,7 +233,7 @@ select thread_id, event_id, event_name, digest_text, sql_text from performance_s
     not exists (select * from master_events_statements_history_long t2 where t2.event_name = t1.event_name);
 
 --echo 
---echo *** Statement digest comparison - expect 1 mismatch for DROP TABLE
+--echo # *** Statement digest comparison - expect 1 mismatch for DROP TABLE
 --echo 
 
 --replace_column 1 [THREAD_ID] 2 [EVENT_ID] 4 [DIGEST]
@@ -243,7 +243,7 @@ select thread_id, event_id, event_name, digest, digest_text, sql_text from perfo
     sql_text like '%marker%' and
     not exists (select * from master_events_statements_history_long t2 where t2.digest = t1.digest);
 
---echo
+--echo #
 --echo #
 --echo # STEP 6 - DISABLE REPLICATED STATEMENT EVENTS ON SLAVE
 --echo #
@@ -255,49 +255,49 @@ update performance_schema.setup_instruments set enabled='no', timed='no'
 
 select * from performance_schema.setup_instruments where name like '%statement/abstract/relay_log%';
 
---echo
+--echo #
 --echo #
 --echo # STEP 7 - UPDATE TABLES ON MASTER, REPLICATE
 --echo #
 
 connection master;
 
---echo
---echo *** Clear statement events
+--echo #
+--echo # *** Clear statement events
 --source ../include/rpl_statements_truncate.inc
 
---echo *** Update some tables, then replicate
---echo
+--echo # *** Update some tables, then replicate
+--echo #
 
 insert into marker1_db.table1 values (999, '999'), (998, '998'), (997, '997');
 
---echo
+--echo #
 --echo #
 --echo # STEP 8 - VERIFY TABLE UPDATES FROM MASTER, EXPECT NO STATEMENT EVENTS ON SLAVE
 --echo #
 
 sync_slave_with_master;
 
---echo
---echo *** Confirm rows were replicated
---echo
+--echo #
+--echo # *** Confirm rows were replicated
+--echo #
 
 select * from marker1_db.table1 where s1 > 900 order by s1;
 
---echo
---echo *** Confirm that are no statements events from the replication thread
---echo
+--echo #
+--echo # *** Confirm that are no statements events from the replication thread
+--echo #
 
 select * from performance_schema.events_statements_history_long
   where thread_id = @slave_thread_id;
 
 --source ../include/enable_instruments.inc
 
---echo
+--echo #
 --echo #
 --echo # STEP 9 - CLEAN UP
 --echo #
---echo
+--echo #
 --disable_query_log
 --disable_warnings
 
diff --git a/mysql-test/suite/perfschema/t/rpl_threads.test b/mysql-test/suite/perfschema/t/rpl_threads.test
new file mode 100644
index 00000000000..984939c21f8
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/rpl_threads.test
@@ -0,0 +1,79 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/have_log_bin.inc
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/master-slave.inc
+
+--disable_warnings
+drop table if exists test.t1;
+--sync_slave_with_master
+reset master;
+--enable_warnings
+
+create table test.t1(a int);
+drop table test.t1;
+
+--source include/show_binlog_events.inc
+
+# Notes
+#
+# The point of this test is to make sure code is properly instrumented,
+# for replication threads.
+# Each time an ID is assigned to a replication thread,
+# visible in the INFORMATION_SCHEMA.PROCESSLIST table,
+# the same PROCESSLIST_ID should be visible in table performance_schema.threads
+
+connection master;
+-- echo "============ Performance schema on master ============"
+
+# Read the ID of the binlog dump connection,
+# as exposed in PROCESSLIST.
+select ID from INFORMATION_SCHEMA.PROCESSLIST
+  where COMMAND = "Binlog Dump"
+  into @master_dump_pid;
+
+select COMMAND, STATE
+  from INFORMATION_SCHEMA.PROCESSLIST
+  where ID = @master_dump_pid;
+
+# Make sure the performance schema also knows this PROCESSLIST_ID
+select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
+  from performance_schema.threads
+  where PROCESSLIST_ID = @master_dump_pid;
+
+sync_slave_with_master;
+-- echo "============ Performance schema on slave ============"
+
+# Read the ID of the SLAVE IO thread,
+# as exposed in PROCESSLIST.
+select ID from INFORMATION_SCHEMA.PROCESSLIST
+  where STATE like "Waiting for master to send event%"
+  into @slave_io_pid;
+
+select COMMAND, STATE
+  from INFORMATION_SCHEMA.PROCESSLIST
+  where ID = @slave_io_pid;
+
+# Make sure the performance schema also knows this PROCESSLIST_ID
+select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
+  from performance_schema.threads
+  where PROCESSLIST_ID = @slave_io_pid;
+
+# Read the ID of the SLAVE SQL thread,
+# as exposed in PROCESSLIST.
+select ID from INFORMATION_SCHEMA.PROCESSLIST
+  where STATE like "Slave has read all relay log%"
+  into @slave_sql_pid;
+
+select COMMAND, STATE
+  from INFORMATION_SCHEMA.PROCESSLIST
+  where ID = @slave_sql_pid;
+
+# Make sure the performance schema also knows this PROCESSLIST_ID
+select NAME, TYPE, PROCESSLIST_COMMAND, PROCESSLIST_STATE
+  from performance_schema.threads
+  where PROCESSLIST_ID = @slave_sql_pid;
+
+--source include/rpl_end.inc
+
diff --git a/mysql-test/suite/perfschema/t/server_init.test b/mysql-test/suite/perfschema/t/server_init.test
index 36e09adea78..ae4f7ac945b 100644
--- a/mysql-test/suite/perfschema/t/server_init.test
+++ b/mysql-test/suite/perfschema/t/server_init.test
@@ -14,9 +14,6 @@ use performance_schema;
 # Verify that these global mutexes have been properly initilized in mysys
 
 select count(name) from mutex_instances
- where name like "wait/synch/mutex/mysys/THR_LOCK_threads";
-
-select count(name) from mutex_instances
  where name like "wait/synch/mutex/mysys/THR_LOCK_malloc";
 
 select count(name) from mutex_instances
@@ -36,10 +33,8 @@ select count(name) from mutex_instances
 
 # There are no global rwlock in mysys
 
-# Verify that these global conditions have been properly initilized in mysys
-
-select count(name) from cond_instances
- where name like "wait/synch/cond/mysys/THR_COND_threads";
+# There are no global conditions in mysys
+# (THR_COND_threads is only present in debug builds
 
 # Verify that these global mutexes have been properly initilized in sql
 
@@ -53,21 +48,9 @@ select count(name) from mutex_instances
  where name like "wait/synch/mutex/sql/LOCK_status";
 
 select count(name) from mutex_instances
- where name like "wait/synch/mutex/sql/LOCK_error_log";
-
-select count(name) from mutex_instances
- where name like "wait/synch/mutex/sql/LOCK_delayed_insert";
-
-select count(name) from mutex_instances
  where name like "wait/synch/mutex/sql/LOCK_uuid_generator";
 
 select count(name) from mutex_instances
- where name like "wait/synch/mutex/sql/LOCK_delayed_status";
-
-select count(name) from mutex_instances
- where name like "wait/synch/mutex/sql/LOCK_delayed_create";
-
-select count(name) from mutex_instances
  where name like "wait/synch/mutex/sql/LOCK_crypt";
 
 select count(name) from mutex_instances
@@ -86,9 +69,6 @@ select count(name) from mutex_instances
  where name like "wait/synch/mutex/sql/LOCK_prepared_stmt_count";
 
 select count(name) from mutex_instances
- where name like "wait/synch/mutex/sql/LOCK_connection_count";
-
-select count(name) from mutex_instances
  where name like "wait/synch/mutex/sql/LOCK_server_started";
 
 # LOG_INFO object are created on demand, and are not global.
@@ -106,10 +86,7 @@ select count(name) from mutex_instances
  where name like "wait/synch/mutex/sql/LOCK_event_queue";
 
 select count(name) from mutex_instances
- where name like "wait/synch/mutex/sql/LOCK_user_locks";
-
-select count(name) from mutex_instances
- where name like "wait/synch/mutex/sql/Cversion_lock";
+ where name like "wait/synch/mutex/sql/LOCK_item_func_sleep";
 
 select count(name) from mutex_instances
  where name like "wait/synch/mutex/sql/LOCK_audit_mask";
@@ -127,9 +104,6 @@ select count(name) from mutex_instances
 # Verify that these global rwlocks have been properly initilized in sql
 
 select count(name) from rwlock_instances
- where name like "wait/synch/rwlock/sql/LOCK_grant";
-
-select count(name) from rwlock_instances
  where name like "wait/synch/rwlock/sql/LOCK_sys_init_connect";
 
 select count(name) from rwlock_instances
diff --git a/mysql-test/suite/perfschema/t/setup_actors.test b/mysql-test/suite/perfschema/t/setup_actors.test
index 1d4a86b6517..9e9e0a4eb80 100644
--- a/mysql-test/suite/perfschema/t/setup_actors.test
+++ b/mysql-test/suite/perfschema/t/setup_actors.test
@@ -9,26 +9,26 @@
 
 # The initial number of rows is 1. The initial row always looks like this:
 # mysql> select * from performance_schema.setup_actors;
-# +------+------+------+
-# | Host | User | ROLE |
-# +------+------+------+
-# | %    | %    | %    |
-# +------+------+------+
+# +------+------+------+---------+---------+
+# | HOST | USER | ROLE | ENABLED | HISTORY |
+# +------+------+------+---------+---------+
+# | %    | %    | %    | YES     | YES     |
+# +------+------+------+---------+---------+
 select * from performance_schema.setup_actors;
 
 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;
@@ -57,7 +57,7 @@ let $con1_thread_id= `select THREAD_ID from performance_schema.threads
 
 --connection default
 insert into performance_schema.setup_actors
-values ('%', 'user1', '%');
+values ('%', 'user1', '%', 'YES', 'YES');
 
 --connection con1
 # INSTRUMENTED must be NO because there was no match in performance_schema.setup_actors
@@ -165,7 +165,7 @@ where PROCESSLIST_ID = connection_id();
 --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;
@@ -182,7 +182,7 @@ where PROCESSLIST_ID = connection_id();
 
 --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
@@ -224,7 +224,7 @@ flush privileges;
 truncate table performance_schema.setup_actors;
 
 insert into performance_schema.setup_actors
-values ('%', '%', '%');
+values ('%', '%', '%', 'YES', 'YES');
 
 select * from performance_schema.setup_actors;
 
diff --git a/mysql-test/suite/perfschema/t/setup_actors_enabled.test b/mysql-test/suite/perfschema/t/setup_actors_enabled.test
new file mode 100644
index 00000000000..959c4d9cb80
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/setup_actors_enabled.test
@@ -0,0 +1,219 @@
+# Check the impact of changes done in ENABLED column in
+# performance_schema.setup_actors.
+
+--source include/not_windows.inc
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+# The initial number of rows is 1. The initial row always looks like this:
+# mysql> select * from performance_schema.setup_actors;
+# +------+------+------+---------+---------+
+# | HOST | USER | ROLE | ENABLED | HISTORY |
+# +------+------+------+---------+---------+
+# | %    | %    | %    | YES     | YES     |
+# +------+------+------+---------+---------+
+select * from performance_schema.setup_actors;
+
+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;
+
+--echo # Switch to (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+
+# INSTRUMENTED must be YES because there is a match in
+# performance_schema.setup_actors and its ENABLED
+select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+let $con1_thread_id= `select THREAD_ID from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--echo # Switch to (con2, localhost, user2, , )
+connect (con2, localhost, user2, , );
+
+# INSTRUMENTED must be NO because there is a match in 
+# performance_schema.setup_actors but its DISABLED.
+select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+let $con1_thread_id= `select THREAD_ID from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--echo # 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';
+
+--echo # Switch to connection con1
+--connection con1
+
+# INSTRUMENTED must still be YES because update to setup_actors doesn't affect
+# existing connetions.
+select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+let $con1_thread_id= `select THREAD_ID from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--echo # Switch to connection con2
+--connection con2
+
+# INSTRUMENTED must still be NO because update to setup_actors doesn't affect
+# existing connetions.
+select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+let $con1_thread_id= `select THREAD_ID from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--echo # Disconnect con1 and con2
+--disconnect con1
+--disconnect con2
+
+# Now reconnect
+--echo # Switch to (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+
+# INSTRUMENTED must still be NO because update to setup_actors affects
+# new connetions.
+select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+let $con1_thread_id= `select THREAD_ID from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--echo # Switch to (con2 localhost, user2, , )
+connect (con2, localhost, user2, , );
+
+# INSTRUMENTED must still be YES because update to setup_actors affects
+# new connetions.
+select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+let $con1_thread_id= `select THREAD_ID from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--echo # Disconnect con1 and con2
+--disconnect con1
+--disconnect con2
+
+--echo # Switch to connection default
+--connection default
+
+# Checking if update is allowed on performance_schema.setup_actors ENABLED 
+# column after revoke update privilege 
+
+revoke update on *.* from 'user2'@'localhost';
+
+flush privileges;
+
+--echo # Switch to (con2 localhost, user2, , )
+connect (con2, localhost, user2, , );
+--error ER_TABLEACCESS_DENIED_ERROR
+update performance_schema.setup_actors 
+  set ENABLED='NO';
+
+--disconnect con2
+--connection default
+
+# Checking for Rules Order 
+# 1. a match for 'U1' and 'H1'.
+# 2. then for 'U1' and '%'.
+# 3. then for '%' and 'H1'.
+# 4. then for '%' and '%'.
+
+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');
+
+
+--echo # Switch to (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+
+# INSTRUMENTED must still be NO as it will match rule1
+# new connetions.
+select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--disconnect con1
+--connection default
+
+delete from performance_schema.setup_actors where
+HOST='localhost' and USER='user1';
+
+--echo # Switch to (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+
+# INSTRUMENTED must still be YES as it will match rule2
+# new connetions.
+select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+
+--disconnect con1
+--connection default
+
+delete from performance_schema.setup_actors where
+HOST='%' and USER='user1';
+
+--echo # Switch to (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+
+# INSTRUMENTED must still be NO as it will match rule3
+# new connetions.
+select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--disconnect con1
+--connection default
+
+delete from performance_schema.setup_actors where
+HOST='localhost' and USER='%';
+
+--echo # Switch to (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+
+# INSTRUMENTED must still be YES as it will match rule4
+# new connetions.
+select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--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;
+
diff --git a/mysql-test/suite/perfschema/t/setup_actors_history.test b/mysql-test/suite/perfschema/t/setup_actors_history.test
new file mode 100644
index 00000000000..ecb3324a3c5
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/setup_actors_history.test
@@ -0,0 +1,177 @@
+# Check the impact of changes done in HISTORY column in
+# performance_schema.setup_actors.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+# The initial number of rows is 1. The initial row always looks like this:
+# mysql> select * from performance_schema.setup_actors;
+# +------+------+------+---------+---------+
+# | HOST | USER | ROLE | ENABLED | HISTORY |
+# +------+------+------+---------+---------+
+# | %    | %    | %    | YES     | YES     |
+# +------+------+------+---------+---------+
+select * from performance_schema.setup_actors;
+
+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;
+
+--echo # Switch to (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+
+# Expecting INSTRUMENTED=YES, HISTORY=YES
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Switch to (con2, localhost, user2, , )
+connect (con2, localhost, user2, , );
+
+# Expecting INSTRUMENTED=YES, HISTORY=NO
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Switch to (con3, localhost, user3, , )
+connect (con3, localhost, user3, , );
+
+# Expecting INSTRUMENTED=NO, HISTORY=YES
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Switch to (con4, localhost, user4, , )
+connect (con4, localhost, user4, , );
+
+# Expecting INSTRUMENTED=NO, HISTORY=NO
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # 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');
+
+--echo # Switch to connection con1
+--connection con1
+
+# Expecting INSTRUMENTED=YES, HISTORY=YES
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Switch to connection con2
+--connection con2
+
+# Expecting INSTRUMENTED=YES, HISTORY=NO
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Switch to connection con3
+--connection con3
+
+# Expecting INSTRUMENTED=NO, HISTORY=YES
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Switch to connection con4
+--connection con4
+
+# Expecting INSTRUMENTED=NO, HISTORY=NO
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Disconnect all con
+--disconnect con1
+--disconnect con2
+--disconnect con3
+--disconnect con4
+
+# Now reconnect
+--echo # Switch to (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+
+# Expecting INSTRUMENTED=YES, HISTORY=NO
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Switch to (con2 localhost, user2, , )
+connect (con2, localhost, user2, , );
+
+# Expecting INSTRUMENTED=YES, HISTORY=YES
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Switch to (con3, localhost, user3, , )
+connect (con3, localhost, user3, , );
+
+# Expecting INSTRUMENTED=NO, HISTORY=NO
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Switch to (con4 localhost, user4, , )
+connect (con4, localhost, user4, , );
+
+# Expecting INSTRUMENTED=NO, HISTORY=YES
+select NAME, TYPE, INSTRUMENTED, HISTORY, PROCESSLIST_USER, PROCESSLIST_HOST
+from performance_schema.threads
+where PROCESSLIST_ID = connection_id();
+
+--echo # Disconnect all con
+--disconnect con1
+--disconnect con2
+--disconnect con3
+--disconnect con4
+
+--echo # 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;
+
diff --git a/mysql-test/suite/perfschema/t/setup_consumers_defaults-master.opt b/mysql-test/suite/perfschema/t/setup_consumers_defaults-master.opt
index bc05fa8d5bc..db53957b031 100644
--- a/mysql-test/suite/perfschema/t/setup_consumers_defaults-master.opt
+++ b/mysql-test/suite/perfschema/t/setup_consumers_defaults-master.opt
@@ -1,11 +1,18 @@
 --loose-performance-schema-consumer-events-stages-current=OFF
 --loose-performance-schema-consumer-events-stages-history=ON
 --loose-performance-schema-consumer-events-stages-history-long=OFF
+
 --loose-performance-schema-consumer-events-statements-current=ON
 --loose-performance-schema-consumer-events-statements-history=OFF
 --loose-performance-schema-consumer-events-statements-history-long=ON
+
+--loose-performance-schema-consumer-events-transactions-current=ON
+--loose-performance-schema-consumer-events-transactions-history=OFF
+--loose-performance-schema-consumer-events-transactions-history-long=ON
+
 --loose-performance-schema-consumer-events-waits-current=OFF
 --loose-performance-schema-consumer-events-waits-history=ON
 --loose-performance-schema-consumer-events-waits-history-long=OFF
+
 --loose-performance-schema-consumer-global-instrumentation=ON
 --loose-performance-schema-consumer-thread-instrumentation=ON
diff --git a/mysql-test/suite/perfschema/t/setup_consumers_defaults.test b/mysql-test/suite/perfschema/t/setup_consumers_defaults.test
index e845e577fb7..d8aa52a1796 100644
--- a/mysql-test/suite/perfschema/t/setup_consumers_defaults.test
+++ b/mysql-test/suite/perfschema/t/setup_consumers_defaults.test
@@ -15,4 +15,4 @@ SELECT @@performance_schema_consumer_events_stages_current;
 --error ER_UNKNOWN_SYSTEM_VARIABLE
 SET @@performance_schema_consumer_events_stages_current=0;
 
-SHOW VARIABLES LIKE "performance_schema_consumer%";
+SHOW GLOBAL VARIABLES LIKE "performance_schema_consumer%";
diff --git a/mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt b/mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt
index ed6702ed5ef..dd2aa078cc4 100644
--- a/mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt
+++ b/mysql-test/suite/perfschema/t/setup_instruments_defaults-master.opt
@@ -9,7 +9,7 @@
 --loose-performance-schema-instrument='  wait/synch/mutex/sql/%   =  OFF  '
 --loose-performance-schema-instrument='wait/synch/mutex/sql/% = OFF '
 --loose-performance-schema-instrument='wait/synch/mutex/sql/LOCK% = ON'
---loose-performance-schema-instrument='wait/synch/mutex/sql/LOCK_thread_count=OFF'
+--loose-performance-schema-instrument='wait/synch/mutex/sql/LOCK_thd_count=OFF'
 --loose-performance-schema-instrument=' wait/synch/mutex/sql/LOCK_user_conn    = COUNTED'
 --loose-performance-schema-instrument='wait%/synch/mutex/sql/LOCK_uu%_genera%/= COUNTED'
 --loose-performance-schema-instrument='%%wait/synch/mutex/sql/LOCK_plugin=COUNTED'
@@ -23,7 +23,6 @@
 --loose-performance-schema-instrument='wait/synch/mutex/sql/THD::LOCK_thd_data= TRUE'
 --loose-performance-schema-instrument='wait/synch/mutex/sql/hash_filo::lock =FALSE'
 --loose-performance-schema-instrument='wait/synch/mutex/sql/TABLE_SHARE::LOCK_ha_data= NO'
-
-
-
+--loose-performance-schema-instrument='memory/%=ON'
+--loose-performance-schema-instrument='memory/performance_schema/%=OFF'
 
diff --git a/mysql-test/suite/perfschema/t/setup_instruments_defaults.test b/mysql-test/suite/perfschema/t/setup_instruments_defaults.test
index 5e0a3a5067a..ea59cd4f266 100644
--- a/mysql-test/suite/perfschema/t/setup_instruments_defaults.test
+++ b/mysql-test/suite/perfschema/t/setup_instruments_defaults.test
@@ -21,13 +21,13 @@ AND enabled = 'yes' AND timed = 'no'
 ORDER BY name;
 
 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';
 
 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;
 
@@ -37,6 +37,21 @@ AND enabled = 'no' AND timed = 'no'
 ORDER BY name;
 
 --echo #
+--echo # Verify that the memory instruments are never timed
+--echo #
+SELECT * FROM performance_schema.setup_instruments
+WHERE name like 'memory/%'
+AND timed = 'YES';
+
+--echo #
+--echo # Verify that the memory/performance_schema instruments are never disabled
+--echo #
+SELECT * FROM performance_schema.setup_instruments
+WHERE name like 'memory/performance_schema/%'
+AND enabled = 'NO';
+
+
+--echo #
 --echo # Verify that the instrument startup settings are not not visible.
 --echo #
 SHOW VARIABLES LIKE "%/wait/synch/mutex%";
diff --git a/mysql-test/suite/perfschema/t/setup_object_table_lock_io.test b/mysql-test/suite/perfschema/t/setup_object_table_lock_io.test
new file mode 100644
index 00000000000..aaa17fa79ad
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/setup_object_table_lock_io.test
@@ -0,0 +1,107 @@
+# Test for Performance Schema.
+# To test the effect of disabling/enabling instrumentation for a table
+# in setup_objects table.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--disable_warnings
+drop table if exists test.setup_objects;
+--enable_warnings
+
+# Make sure only table io / table lock is instrumented and timed
+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');
+
+# Remove noise from previous tests
+truncate table performance_schema.table_io_waits_summary_by_table;
+truncate table performance_schema.table_lock_waits_summary_by_table;
+
+# Save the setup
+create table test.setup_objects as select * from performance_schema.setup_objects;
+truncate table performance_schema.setup_objects;
+select * from performance_schema.setup_objects;
+
+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;
+SET sql_mode = default;
+
+--disable_warnings
+drop database if exists db1;
+--enable_warnings
+
+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 some values in tables.
+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');
+
+# Query P_S tables. Stats should be updated.
+select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
+       from performance_schema.table_lock_waits_summary_by_table
+       where OBJECT_SCHEMA='db1';
+select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
+       from performance_schema.table_io_waits_summary_by_table
+       where OBJECT_SCHEMA='db1';
+
+truncate table db1.t1;
+truncate table db1.t2;
+
+# Query P_S tables. Stats should be updated.
+select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
+       from performance_schema.table_lock_waits_summary_by_table
+       where OBJECT_SCHEMA='db1';
+select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
+       from performance_schema.table_io_waits_summary_by_table
+       where OBJECT_SCHEMA='db1';
+
+# Disable instrumentation for db1.t1
+update performance_schema.setup_objects
+  set ENABLED='NO' where OBJECT_SCHEMA = 'db1' and OBJECT_NAME='t1';
+
+# Query P_S tables. Stats for db1.t1 should have been removed while for db1.t2 it should have been preserved.
+select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
+       from performance_schema.table_lock_waits_summary_by_table
+       where OBJECT_SCHEMA='db1';
+select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
+       from performance_schema.table_io_waits_summary_by_table
+       where OBJECT_SCHEMA='db1';
+
+# Enable instrumentation for db1.t1
+update performance_schema.setup_objects
+  set ENABLED='YES' where OBJECT_SCHEMA = 'db1' and OBJECT_NAME='t1';
+
+# Query P_S tables. Stats for db1.t1 should have been reset while for db1.t2 it should have been preserved.
+select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
+       from performance_schema.table_lock_waits_summary_by_table
+       where OBJECT_SCHEMA='db1';
+select OBJECT_SCHEMA, OBJECT_NAME, COUNT_STAR, COUNT_READ, COUNT_WRITE
+       from performance_schema.table_io_waits_summary_by_table
+       where OBJECT_SCHEMA='db1';
+
+truncate table performance_schema.setup_objects;
+
+select count(*) from performance_schema.setup_objects;
+
+drop database db1;
+
+# Restore the setup
+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/t/setup_objects.test b/mysql-test/suite/perfschema/t/setup_objects.test
index eb22953b1a6..604b35b00ca 100644
--- a/mysql-test/suite/perfschema/t/setup_objects.test
+++ b/mysql-test/suite/perfschema/t/setup_objects.test
@@ -48,8 +48,7 @@ insert into performance_schema.setup_objects
   values ('TABLE', 'db4', '%', 'YES', 'NO');
 
 # Also test insert of invalid enum values
-
-set sql_mode= '';
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
 --error ER_NO_REFERENCED_ROW_2
 insert into performance_schema.setup_objects
   values ('SOMETHING', 'bad1', 'bad1', 'YES', 'NO');
@@ -89,8 +88,7 @@ update performance_schema.setup_objects
 
 select * from performance_schema.setup_objects
   order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME;
-set sql_mode= DEFAULT;
-
+SET sql_mode = default;
 --disable_warnings
 drop database if exists db1;
 drop database if exists db2;
diff --git a/mysql-test/suite/perfschema/t/short_option_1-master.opt b/mysql-test/suite/perfschema/t/short_option_1-master.opt
index d3ad08d3d54..a9cda7a08ed 100644
--- a/mysql-test/suite/perfschema/t/short_option_1-master.opt
+++ b/mysql-test/suite/perfschema/t/short_option_1-master.opt
@@ -1 +1 @@
--a -Cutf8 --collation-server=utf8_bin -T12 -W3
+-a -Cutf8 --collation-server=utf8_bin -T12 -W2
diff --git a/mysql-test/suite/perfschema/t/short_option_1.test b/mysql-test/suite/perfschema/t/short_option_1.test
index ff62a392cfa..4d00c3729d8 100644
--- a/mysql-test/suite/perfschema/t/short_option_1.test
+++ b/mysql-test/suite/perfschema/t/short_option_1.test
@@ -6,13 +6,13 @@ select 'Ok, the server started' as result;
 # See the associated -master.opt file.
 
 select @@SQL_MODE;
-show variables like 'sql_mode';
+show global variables like 'sql_mode';
 
 select @@character_set_server;
-show variables like 'character_set_system';
+show global variables like 'character_set_system';
 
-show variables like 'general_log';
+show global variables like 'general_log';
 
-show variables like 'new';
+show global variables like 'new';
 
-show variables like 'log_warnings';
+show global variables like 'log_warnings';
diff --git a/mysql-test/suite/perfschema/t/short_option_2-master.opt b/mysql-test/suite/perfschema/t/short_option_2-master.opt
index 5cf7590a1c8..5d45b9ec91d 100644
--- a/mysql-test/suite/perfschema/t/short_option_2-master.opt
+++ b/mysql-test/suite/perfschema/t/short_option_2-master.opt
@@ -1 +1 @@
--aW5
+-aW2
diff --git a/mysql-test/suite/perfschema/t/short_option_2.test b/mysql-test/suite/perfschema/t/short_option_2.test
index 77798c36722..0921849cd08 100644
--- a/mysql-test/suite/perfschema/t/short_option_2.test
+++ b/mysql-test/suite/perfschema/t/short_option_2.test
@@ -4,11 +4,11 @@
 select 'Ok, the server started' as result;
 
 # See the associated -master.opt file.
-# -aW5 should be parsed as -a -W5, which are two separate short options
+# -aW2 should be parsed as -a -W2, which are two separate short options
 # stuffed inside a single argv[i] argument.
 
 # Should contain ANSI, since we started the server with -a (stands for --ansi)
 select @@SQL_MODE;
 
-# Should be 5, since we started the server with -W5
+# Should be 2, since we started the server with -W2
 select @@log_warnings;
diff --git a/mysql-test/suite/perfschema/t/show_aggregate.test b/mysql-test/suite/perfschema/t/show_aggregate.test
new file mode 100644
index 00000000000..3f01de15b01
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/show_aggregate.test
@@ -0,0 +1,306 @@
+################# suite/perfschema/t/show_aggregate.test #######################
+#                                                                              #
+# This test verifies:                                                          #
+# 1. Status variable values are consistent with corresponding server events.   #
+# 2. Status variable values are consistent across session, thread, account,    #
+#    host, user and global tables.                                             #
+# 3. Status totals for user, host and account are retained after related       #
+#    threads disconnect.                                                       #
+################################################################################
+
+--source include/have_perfschema.inc
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+--source include/no_protocol.inc
+--source include/maybe_pool_of_threads.inc
+
+--enable_connect_log
+
+--echo #
+--echo # ================================================================================
+--echo # SETUP
+--echo # ================================================================================
+SET @@session.sql_log_bin=OFF;
+--echo #
+--echo # CREATE 3 CLIENTS, 3 CONNECTIONS, RESULTS TABLE
+connection default;
+USE test;
+
+# Clear user, host and account status accumulated from preliminary checks by mtr.
+--disable_query_log
+flush status;
+--enable_query_log
+
+--echo #
+--echo # 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');
+
+--echo 
+--echo # 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;
+--echo #
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # CONNECTION 1: DELETE 1, ROLLBACK x 1
+--echo # ================================================================================
+connect(con1, localhost, user1,,);
+SET @@session.sql_log_bin=OFF;
+DELETE FROM t1 WHERE s1 = 1;
+START TRANSACTION;
+INSERT INTO t1 VALUES (1);
+ROLLBACK;
+
+--echo #
+--echo # ================================================================================
+--echo # CONNECTION 2: DELETE 2, ROLLBACK x 2
+--echo # ================================================================================
+connect(con2, localhost, user2,,);
+SET @@session.sql_log_bin=OFF;
+DELETE FROM t1 WHERE s1 = 2;
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (2);
+ROLLBACK;
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (2);
+ROLLBACK;
+
+--echo #
+--echo # ================================================================================
+--echo # CONNECTION 3: DELETE 3, ROLLBACK x 3
+--echo # ================================================================================
+connect(con3, localhost, user3,,);
+SET @@session.sql_log_bin=OFF;
+DELETE FROM t1 WHERE s1 = 3;
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (3);
+ROLLBACK;
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (3);
+ROLLBACK;
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (3);
+ROLLBACK;
+
+--echo #
+--echo # ================================================================================
+--echo # CONNECTION DEFAULT: Gather results, compare session and global status counts
+--echo # ================================================================================
+connection default;
+--echo # 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');
+
+--source ../include/show_aggregate.inc
+
+#--echo DEBUG
+#USE test;
+#SELECT * FROM test.status_results;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 1: STATUS_BY_THREAD: Verify expected status counts per thread (1,2,3)
+--echo # ================================================================================
+--echo #
+--echo # Review per-thread status counts
+--echo #
+USE performance_schema;
+--replace_column 1 thread_id
+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;
+
+--echo #
+--echo # Verify expected counts for 'handler_delete' per thread
+--echo # 
+--replace_column 1 connect_1
+SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con1_id AND variable_name IN ('handler_delete');
+--echo #
+--replace_column 1 connnect_2
+SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con2_id AND variable_name IN ('handler_delete');
+--echo #
+--replace_column 1 connnect_3
+SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con3_id AND variable_name IN ('handler_delete');
+
+--echo #
+--echo # STATUS_BY_THREAD vs. GLOBAL_STATUS
+--echo #
+SELECT variable_name, t1, t2, t3, delta, thread, IF(thread=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 2: STATUS_BY_USER: Verify expected status counts per user (1,2,3)
+--echo # ================================================================================
+SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete');
+--echo #
+SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete');
+--echo #
+SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete');
+
+--echo #
+--echo # STATUS_BY_USER vs. GLOBAL_STATUS
+--echo #
+SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 3: STATUS_BY_ACCOUNT: Verify expected status counts per user, host (1,2,3)
+--echo # ================================================================================
+SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete');
+--echo #
+SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete');
+--echo #
+SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete');
+
+--echo #
+--echo # STATUS_BY_ACCOUNT vs. GLOBAL_STATUS
+--echo #
+SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+
+--echo # ================================================================================
+--echo # TEST 4: STATUS_BY_HOST: Verify expected status counts per host (6)
+--echo # ================================================================================
+SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
+
+--echo #
+--echo # STATUS_BY_HOST vs. GLOBAL_STATUS
+--echo #
+--echo # Special case: No way to isolate pre-existing 'localhost' activity, so
+--echo # just check global totals = sum(status_by_host).
+--echo #
+SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+
+--echo #
+--echo # ================================================================================
+--echo # DISCONNECT ALL USERS AND RUN THE TESTS AGAIN. RESULTS SHOULD NOT CHANGE.
+--echo # ================================================================================
+connection default;
+disconnect con1;
+disconnect con2;
+disconnect con3;
+--echo #
+USE test;
+--echo #
+--echo # 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;
+
+#--echo DEBUG
+#SELECT * FROM test.status_results;
+--echo #
+--source ../include/show_aggregate.inc
+
+USE performance_schema;
+--echo #
+--echo # ================================================================================
+--echo # TEST X: STATUS_BY_THREAD: Connections are gone--nothing to verify.
+--echo # ================================================================================
+--echo #
+--echo # ================================================================================
+--echo # TEST 5: STATUS_BY_USER: Verify expected status counts per user (1,2,3)
+--echo # ================================================================================
+SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete');
+--echo #
+SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete');
+--echo #
+SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete');
+
+--echo #
+--echo # STATUS_BY_USER vs. GLOBAL_STATUS
+--echo #
+SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 6: STATUS_BY_ACCOUNT: Verify expected status counts per user:host (1,2,3)
+--echo # ================================================================================
+SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete');
+--echo #
+SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete');
+--echo #
+SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete');
+
+--echo #
+--echo # STATUS_BY_ACCOUNT vs. GLOBAL_STATUS
+--echo #
+SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+
+--echo # ================================================================================
+--echo # TEST 7: STATUS_BY_HOST: Verify expected status counts per host (6)
+--echo # ================================================================================
+SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
+
+--echo #
+--echo # STATUS_BY_HOST vs. GLOBAL_STATUS
+--echo #
+--echo # Special case: No way to isolate pre-existing 'localhost' activity, so
+--echo # just check global totals = sum(status_by_host).
+--echo #
+SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OK','ERROR') Expected
+FROM test.status_results
+ORDER BY variable_name;
+
+
+--echo # ================================================================================
+--echo # TEST 8: FLUSH STATUS should clear account, host and user status
+--echo # ================================================================================
+--echo #
+FLUSH STATUS;
+--echo #
+SELECT * FROM status_by_account WHERE user IN ('user1', 'user2', 'user3') AND variable_name IN ('handler_delete');
+--echo #
+SELECT * FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
+--echo #
+SELECT * FROM status_by_user WHERE user IN ('user1', 'user2', 'user3') AND variable_name IN ('handler_delete');
+
+
+--echo # ================================================================================
+--echo # CLEANUP
+--echo # ================================================================================
+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;
+--echo #
diff --git a/mysql-test/suite/perfschema/t/show_coverage.test b/mysql-test/suite/perfschema/t/show_coverage.test
new file mode 100644
index 00000000000..6a8d90d6058
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/show_coverage.test
@@ -0,0 +1,186 @@
+################### suite/perfschema/t/show_coverage.test ######################
+#                                                                              #
+# Testcases to increase DGCOV coverage of the status and system variable       #
+# implementation in the Performance Schema.                                    #
+#                                                                              #
+################################################################################
+--source include/have_perfschema.inc
+--source include/not_embedded.inc
+--source include/no_protocol.inc
+--source include/count_sessions.inc
+
+--echo #
+--echo # TEST 1
+--echo # Handling of SHOW STATUS/VARIABLES ... WHERE
+--echo #
+SHOW STATUS WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW GLOBAL STATUS WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW SESSION STATUS WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW GLOBAL VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+
+--echo #
+--echo # TEST 2
+--echo # CREATE..SELECT -- Expect correct ER_WARN_DEPRECATED_SYNTAX
+--echo #
+USE test;
+CREATE TABLE t0 SELECT * FROM information_schema.global_status WHERE variable_name = 'COM_SELECT';
+DROP TABLE t0;
+
+--echo #
+--echo # TEST 3
+--echo # Select status and system variable tables using ORDER BY to exercise the
+--echo # rnd_pos() method
+--echo #
+use performance_schema;
+--disable_result_log
+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;
+--enable_result_log
+
+--echo #
+--echo # TEST 4
+--echo # Handling of SHOW STATUS/VARIABLES ... WHERE
+--echo #
+SHOW STATUS WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW GLOBAL STATUS WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW SESSION STATUS WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW GLOBAL VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+
+--echo #
+--echo # TEST 5
+--echo # Confirm FLUSH STATUS resets counters for all threads.
+--echo #
+--echo #
+--echo # Create a new connection
+--connect(con1, localhost, root,,)
+--echo #
+--echo # Record thread id
+let $thread_id= `SELECT THREAD_ID FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID()`;
+--echo #
+--echo # Increase bytes_received for new connection
+USE test;
+SHOW TABLES;
+--connection default
+USE performance_schema;
+--disable_query_log
+eval SELECT $thread_id INTO @thread_id;
+--enable_query_log
+
+--echo #
+--echo # 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;
+--echo #
+--echo # Reset status counters
+FLUSH STATUS;
+--echo #
+--echo # 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;
+--echo #
+--echo # Expect bytes_before > bytes_after
+SELECT @bytes_before > @bytes_after AS 'Expect 1';
+--echo #
+--echo # Expect bytes_after is zero
+SELECT @bytes_after AS 'Expect 0';
+
+disconnect con1;
+--source include/wait_until_count_sessions.inc
+
+
+--echo #
+--echo # TEST 6
+--echo #
+--echo # Bug#28291258 FLUSH STATUS ADDS TWICE TO GLOBAL VALUES
+--echo #
+
+--echo #
+--echo # Default connection
+--let $initial_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1)
+
+--source include/count_sessions.inc
+
+--echo #
+--echo # First connection
+--connect (con1, localhost, root,,)
+
+## Global value requested from the first session must not change
+--let $current_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1)
+--let $assert_cond = $current_global_value - $initial_global_value = 0
+--let $assert_text = Global value requested from the first session must not change
+--source include/assert.inc
+
+--echo #
+--echo # Generate a slow query
+--echo #
+SET long_query_time = 2;
+SELECT SLEEP(4);
+SET long_query_time = @@global.long_query_time;
+--echo #
+
+## Global value requested from the first session after SLEEP() must increase by 1
+--let $current_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1)
+--let $first_session_value = query_get_value(SHOW SESSION STATUS LIKE 'Slow_queries', Value, 1)
+--let $assert_cond = $current_global_value - $initial_global_value = 1
+--let $assert_text = Global value requested from the first session after SLEEP() must increase by 1
+--source include/assert.inc
+--let $assert_cond = $first_session_value = 1
+--let $assert_text = First session value must increase by 1
+--source include/assert.inc
+
+--connection default
+--disconnect con1
+--source include/wait_until_count_sessions.inc
+
+--echo #
+--echo # Default connection
+--connection default
+
+## Global value requested from the default session after DISCONNECT must remain the same
+--let $current_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1)
+--let $default_session_value = query_get_value(SHOW SESSION STATUS LIKE 'Slow_queries', Value, 1)
+--let $assert_cond = $current_global_value - $initial_global_value = 1
+--let $assert_text = Global value requested from the default session after DISCONNECT must remain the same
+--source include/assert.inc
+
+## Default session value must remain zero
+--let $assert_cond = $default_session_value = 0
+--let $assert_text = Default session value must remain zero
+--source include/assert.inc
+
+--echo #
+FLUSH STATUS;
+--echo #
+
+## Global value requested from the default session after FLUSH must remain the same
+--let $current_global_value = query_get_value(SHOW GLOBAL STATUS LIKE 'Slow_queries', Value, 1)
+--let $default_session_value = query_get_value(SHOW SESSION STATUS LIKE 'Slow_queries', Value, 1)
+--let $assert_cond = $current_global_value - $initial_global_value = 1
+--let $assert_text = Global value requested from the default session after FLUSH must remain the same
+--source include/assert.inc
+
+## Default session value after FLUSH must remain zero
+--let $assert_cond = $default_session_value = 0
+--let $assert_text = Default session value after FLUSH must remain zero
+--source include/assert.inc
diff --git a/mysql-test/suite/perfschema/t/show_misc.test b/mysql-test/suite/perfschema/t/show_misc.test
new file mode 100644
index 00000000000..e557ef31e94
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/show_misc.test
@@ -0,0 +1,64 @@
+--source include/have_perfschema.inc
+--source include/not_embedded.inc
+--source include/no_protocol.inc
+
+select 1;
+SHOW STATUS LIKE 'Last_query_partial_plans';
+select 2;
+SHOW STATUS LIKE 'Last_query_cost';
+
+flush status;
+SHOW STATUS LIKE 'Created_tmp_tables';
+
+--echo #
+--echo # ================================================================================
+--echo # Bug#21789221 SHOW STATUS FAILS WITH LOCK TABLES AND SHOW_COMPATIBILITY_56=OFF
+--echo # ================================================================================
+--echo # Verify that SHOW STATUS and SHOW VARIABLES works under LOCK TABLES mode
+--echo #
+CREATE TABLE test.t1 (s1 INT);
+LOCK TABLE test.t1 READ;
+--echo #
+SHOW GLOBAL STATUS WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW SESSION STATUS WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW GLOBAL VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+UNLOCK TABLES;
+--echo #
+LOCK TABLE test.t1 WRITE;
+--echo #
+SHOW GLOBAL STATUS WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW SESSION STATUS WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW GLOBAL VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+SHOW SESSION VARIABLES WHERE VARIABLE_NAME LIKE "foo";
+--echo #
+UNLOCK TABLES;
+
+DROP TABLE test.t1;
+
+
+--echo #
+--echo # ================================================================================
+--echo # Bug#28515475 BOGUS DATA WHEN ORDERING RESULTS FROM VARIABLES_BY_THREAD 
+--echo # ================================================================================
+--echo # Verify the results from "WHERE variable_name IN(...)", particularly for those
+--echo # variables that are listed after the deprecated variable gtid_executed.
+--echo # The ORDER BY also forces an additional code path through rnd_pos().
+--echo #
+
+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; 
+
+
+--echo #
+--echo # ================================================================================
+--echo # CLEAN UP
+--echo # ================================================================================
diff --git a/mysql-test/suite/perfschema/t/show_plugin.test b/mysql-test/suite/perfschema/t/show_plugin.test
new file mode 100644
index 00000000000..7109c3140c6
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/show_plugin.test
@@ -0,0 +1,321 @@
+################# suite/perfschema/t/show_plugin.test ##########################
+#                                                                              #
+# MySQL plugins can define their own status variables and system variables.    #
+# This test exercises SHOW STATUS, SHOW VARIABLES and the status and system    #
+# variable tables while the EXAMPLE plugin is loaded and unloaded.             #
+#                                                                              #
+# The EXAMPLE plugin defines the following system and status variables:        #
+# Global system variables:                                                     # 
+#   example_double_thdvar                                                      #
+#   example_double_var                                                         #
+#   example_enum_var                                                           #
+#   example_ulong_var                                                          #
+#                                                                              #
+# Session variables:                                                           #
+#   example_double_thdvar - Local and/or global                                #
+#                                                                              #
+# Global status:                                                               #
+#   example_func_example  - Status function                                    #
+#                                                                              #
+################################################################################
+
+--source include/have_perfschema.inc
+--source include/not_embedded.inc
+--source include/not_windows_embedded.inc
+--source include/have_example_plugin.inc
+--source include/have_innodb.inc
+--source include/have_debug_sync.inc
+
+--enable_connect_log
+
+--echo #
+--echo # ================================================================================
+--echo # SETUP
+--echo # ================================================================================
+--echo # Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+--echo #
+--echo # Verify EXAMPLE plugin is not loaded
+SELECT COUNT(*) = 0 AS "Expect 1" FROM information_schema.plugins WHERE plugin_name = "EXAMPLE";
+--echo #
+--echo # Create one session to force local and global system variables
+--connect(con0, localhost, root,,)
+--connection default
+--echo #
+--echo # ================================================================================
+--echo # TEST 1- NO PLUGIN VARS
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+--echo #
+
+--echo # ================================================================================
+--echo # TEST 2 - PLUGIN LOAD, UNLOAD, RELOAD
+--echo # ================================================================================
+--echo # ================================================================================
+--echo # 2.1 - INSTALL PLUGIN
+--echo # ================================================================================
+INSTALL PLUGIN example SONAME 'ha_example';
+
+--echo #
+--echo # ================================================================================
+--echo # 2.1a - FORCE SYNC OF LOCAL AND GLOBAL SYSTEM VARS
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+
+--disconnect con0
+
+--echo #
+--echo # ================================================================================
+--echo # 2.2 - SET PLUGIN VARS
+--echo # ================================================================================
+--echo # GLOBAL
+SET GLOBAL example_ulong_var = 100;
+SET GLOBAL example_enum_var = e1;
+SET GLOBAL example_double_var = 100.9990;
+SET GLOBAL example_double_thdvar = 101.9991;
+--echo # SESSION
+SET SESSION example_double_thdvar = 102.9992;
+
+--echo #
+--echo # ================================================================================
+--echo # 2.3 - VERIFY UPDATED PLUGIN VARS
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+
+--echo #
+--echo # ================================================================================
+--echo # 2.4 - UNINSTALL PLUGIN
+--echo # ================================================================================
+UNINSTALL PLUGIN example;
+
+--echo #
+--echo # ================================================================================
+--echo # 2.5 - VERIFY NO PLUGIN VARS
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+
+--echo #
+--echo # ================================================================================
+--echo # 2.6 - REINSTALL PLUGIN
+--echo # ================================================================================
+--echo # Reinstall EXAMPLE plugin
+INSTALL PLUGIN example SONAME 'ha_example';
+
+--echo #
+--echo # ================================================================================
+--echo # 2.7 - SET PLUGIN VARS AGAIN
+--echo # ================================================================================
+--echo # GLOBAL
+SET GLOBAL example_ulong_var = 200;
+SET GLOBAL example_enum_var = e2;
+SET GLOBAL example_double_var = 200.8880;
+SET GLOBAL example_double_thdvar = 201.8881;
+--echo # SESSION
+SET SESSION example_double_thdvar = 202.8882;
+
+--echo #
+--echo # ================================================================================
+--echo # 2.8 - VERIFY PLUGIN VARS
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+
+--echo #
+--echo # ================================================================================
+--echo # 2.9 - UNINSTALL PLUGIN
+--echo # ================================================================================
+UNINSTALL PLUGIN example;
+
+--echo #
+--echo # ================================================================================
+--echo # 2.10 - VERIFY NO PLUGIN VARS
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 3 - SESSION PLUGIN VARS ON MULTIPLE CONNECTIONS
+--echo # ================================================================================
+--echo #
+--echo # ================================================================================
+--echo # 3.1 - INSTALL PLUGIN
+--echo # ================================================================================
+INSTALL PLUGIN example SONAME 'ha_example';
+
+--echo #
+--echo # ================================================================================
+--echo # 3.2 - SET GLOBAL AND DEFAULT CONNECTION VARS
+--echo # ================================================================================
+--connection default
+SET GLOBAL example_ulong_var = 300;
+SET GLOBAL example_enum_var = e1;
+SET GLOBAL example_double_var = 301.0000;
+SET GLOBAL example_double_thdvar = 302.0000;
+SET SESSION example_double_thdvar = 300.0000;
+
+--echo #
+--echo # ================================================================================
+--echo # 3.3 - CONNECT 3 CLIENTS, SET LOCAL PLUGIN VARS
+--echo # ================================================================================
+--connect(con1, localhost, root,,)
+SET SESSION example_double_thdvar = 300.1111;
+--echo #
+--connect(con2, localhost, root,,)
+SET SESSION example_double_thdvar = 300.2222;
+--echo #
+--connect(con3, localhost, root,,)
+SET SESSION example_double_thdvar = 300.3333;
+--echo #
+--connection default
+
+--echo #
+--echo # ================================================================================
+--echo # 3.4 - VERIFY GLOBAL AND SESSION PLUGIN VARS
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+--echo #
+--echo # Variables by thread
+SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
+WHERE variable_name LIKE "example_%" ORDER BY variable_value;
+
+--echo #
+--echo # ================================================================================
+--echo # 3.5 - DISCONNECT CLIENTS
+--echo # ================================================================================
+--connection con1
+--disconnect con1
+--source include/wait_until_disconnected.inc
+
+--connection con2
+--disconnect con2
+--source include/wait_until_disconnected.inc
+
+--connection con3
+--disconnect con3
+--source include/wait_until_disconnected.inc
+
+--connection default
+
+--echo #
+--echo # ================================================================================
+--echo # 3.6 - VERIFY SESSION VARS ARE REMOVED
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+--echo #
+--echo # Variables by thread
+SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
+WHERE variable_name LIKE "example_%" ORDER BY variable_value;
+
+--echo #
+--echo # ================================================================================
+--echo # 3.7 - RECONNECT 3 CLIENTS, SET SESSION VARS FOR EACH
+--echo # ================================================================================
+--connect(con1, localhost, root,,)
+SET SESSION example_double_thdvar = 311.1111;
+--echo #
+--connect(con2, localhost, root,,)
+SET SESSION example_double_thdvar = 322.2222;
+--echo #
+--connect(con3, localhost, root,,)
+SET SESSION example_double_thdvar = 333.3333;
+--echo #
+--connection default
+
+--echo #
+--echo # ================================================================================
+--echo # 3.8 - VERIFY GLOBAL AND SESSION VARS
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+--echo #
+--echo # Variables by thread
+SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
+WHERE variable_name LIKE "example_%" ORDER BY variable_value;
+
+--echo #
+--echo # ================================================================================
+--echo # 3.9 - UNINSTALL PLUGIN, LEAVE CLIENTS CONNECTED
+--echo # ================================================================================
+UNINSTALL PLUGIN example;
+
+--echo #
+--echo # ================================================================================
+--echo # 3.10 - VERIFY SESSION VARS ARE REMOVED
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+--echo #
+--echo # VARIABLES BY THREAD
+SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
+WHERE variable_name LIKE "example_%" ORDER BY variable_value;
+
+--echo #
+--echo # ================================================================================
+--echo # 3.11 - DISCONNECT CLIENTS
+--echo # ================================================================================
+--connection con1
+--disconnect con1
+--source include/wait_until_disconnected.inc
+
+--connection con2
+--disconnect con2
+--source include/wait_until_disconnected.inc
+
+--connection con3
+--disconnect con3
+--source include/wait_until_disconnected.inc
+
+--connection default
+
+--echo #
+--echo # ================================================================================
+--echo # 3.12 - VERIFY CLIENTS ARE REMOVED
+--echo # ================================================================================
+--source ../include/show_plugin_verifier.inc
+--echo #
+--echo # VARIABLES BY THREAD
+SELECT variable_name, variable_value FROM performance_schema.variables_by_thread
+WHERE variable_name LIKE "example_%" ORDER BY variable_value;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 4 - BUG#18008907: DEADLOCK WITH CHANGE_USER, SHOW VARIABLES, INSTALL PLUGIN
+--echo # ================================================================================
+--echo #
+--echo #
+--echo # ================================================================================
+--echo # TEST 5 - BUG#22225549 MYSQL_CHANGE_USER/MYSQL_RESET_CONNECTION + SET INNODB...
+--echo          Update to plugin-defined session variable triggers resync with global
+--echo          variables and deadlocks on THD::LOCK_thd_sysvar.
+--echo # ================================================================================
+#
+# The deadlock occurs when plugin-defined session variables are resynced with the global
+# variables. To force a resync, change the user and update a session variable from a
+# plugin, in this case InnoDB.
+#
+select @@session.innodb_strict_mode;
+let $innodb_strict_mode_save = `select @@session.innodb_strict_mode`;
+select user(), current_user();
+--echo # change_user root
+--change_user root
+--echo #
+--echo # Trigger a resync of session variables with global variables.
+--echo #
+set @@session.innodb_strict_mode=off;
+
+--echo #
+--echo # Restore
+--echo #
+eval set @@session.innodb_strict_mode=$innodb_strict_mode_save;
+select @@session.innodb_strict_mode;
+
+--echo #
+--echo # ================================================================================
+--echo # CLEAN UP
+--echo # ================================================================================
+--connection default
+--echo #
+
+--echo #
+--disable_connect_log
+
+--echo #
+--echo # Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/perfschema/t/show_sanity.test b/mysql-test/suite/perfschema/t/show_sanity.test
new file mode 100644
index 00000000000..61161ea5df6
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/show_sanity.test
@@ -0,0 +1,1850 @@
+################# suite/perfschema/t/show_sanity.test ##########################
+#                                                                              #
+# Compare global/session status and system variables in the Information Schema #
+# to those in Performance Schema. Do this once with SHOW_COMPATIBILITY_56 = ON #
+# again with SHOW_COMPATIBILITY_56 = OFF.                                      #
+#                                                                              #
+# Status and system variables may have a scope of:                             #
+#                                                                              #
+# GLOBAL       - System level only.                                            #
+# SESSION      - Applies at both the global and session level.                 #
+#                Status variables with SESSION scope are totaled across all    #
+#                threads for global queries such as SHOW GLOBAL STATUS.        #
+#                System variables with SESSION scope have a global default     #
+#                that can be changed at the session level.                     #
+# SESSION-ONLY - Client connection level only.                                 #
+#                                                                              #
+#==============================================================================#
+# This test consists of two phases:                                            #
+#                                                                              #
+# COLLECTION - Gather results from SHOW commands and SELECTs on the I_S/P_S    #
+# tables into a single table. Tag each variable with the source (SHOW, SELECT, #
+# P_S, I_S) and compatibility mode setting (OFF, ON).                          #
+#                                                                              #
+# VERIFICATION - Compare and cross-reference the results between and across    #
+# sources and compatibility modes, factoring in the known variances.           #
+#                                                                              #
+# The verification phase assumes that there will be no variation between the   #
+# 5.6 and 5.7 results as long as known discrepancies in scope handling are     #
+# accounted for. Expected variations are tagged as "JUNK" and filtered from    #
+# the comparisons.                                                             #
+#                                                                              #
+# The expected scope for each variable was initially determined from the MySQL #
+# system and status variable documentation and then further verified by the    #
+# actual implementation.                                                       #
+#                                                                              #
+# The difference between how 5.6 and 5.7 manage query scope vs. variable scope #
+# are summarized as follows:                                                   #
+#                                                                              #
+# *** SHOW_COMPATIBILITY_56 = ON ***                                           #
+#                                                                              #
+# SHOW GLOBAL STATUS / I_S.GLOBAL_STATUS                                       #
+#  GLOBAL  - Yes                                                               #
+#  SESSION - Yes, totaled across all threads                                   #
+#  SESSION-ONLY - Yes, current session                                         #
+#                                                                              #
+# SHOW SESSION STATUS / I_S.SESSION_STATUS                                     #
+#  GLOBAL  - Yes                                                               #
+#  SESSION - Yes, current session                                              #
+#  SESSION-ONLY - Yes                                                          #
+#                                                                              #
+# SHOW GLOBAL VARIABLES / I_S.GLOBAL_VARIABLES                                 #
+#  GLOBAL  - Yes                                                               #
+#  SESSION - Yes                                                               #
+#  SESSION-ONLY - No                                                           #
+#                                                                              #
+# SHOW SESSION VARIABLES / I_S.SESSION_VARIABLES                               #
+#  GLOBAL  - Yes                                                               #
+#  SESSION - Yes, current session                                              #
+#  SESSION-ONLY - Yes                                                          #
+#                                                                              #
+# *** SHOW_COMPATIBILITY_56 = OFF ***                                          #
+#                                                                              #
+# Information Schema status and system tables are disabled                     #
+#  (ER_FEATURE_DISABLED_SEE_DOC).                                              #
+#                                                                              #
+# SHOW GLOBAL STATUS / P_S.GLOBAL_STATUS                                       #
+#  GLOBAL  - Yes                                                               #
+#  SESSION - Yes (totaled across all threads for SHOW STATUS)                  #
+#  SESSION-ONLY - No                                                           #
+#                                                                              #
+# SHOW SESSION STATUS / P_S.SESSION_STATUS, STATUS_BY_THREAD                   #
+#  GLOBAL  - No                                                                #
+#  SESSION - Yes                                                               #
+#  SESSION-ONLY - Yes                                                          #
+#                                                                              #
+# P_S.STATUS_BY_USER / HOST / ACCOUNT                                          #
+#  GLOBAL  - No                                                                #
+#  SESSION - Yes (totaled across all related threads)                          #
+#  SESSION-ONLY - No                                                           #
+#                                                                              #
+# SHOW GLOBAL VARIABLES / P_S.GLOBAL_VARIABLES                                 #
+#  GLOBAL  - Yes                                                               #
+#  SESSION - No                                                                #
+#  SESSION-ONLY - No                                                           #
+#                                                                              #
+# SHOW SESSION VARIABLES / P_S.SESSION_VARIABLES, VARIABLES_BY_THREAD          #
+#  GLOBAL  - No                                                                #
+#  SESSION - Yes                                                               # 
+#  SESSION-ONLY - Yes                                                          #
+#                                                                              #
+# In addition to the differences in how variable scope is handled, comparisons #
+# between 5.6 and 5.7 must also account for differences in how variables are   #
+# represented based upon the variable type or meaning. For example,            #
+# SESSION-ONLY variables such as "Last Query Cost" have no meaning when        #
+# aggregated by user, account or host.                                         #
+#                                                                              #
+# These additional differences are summarized as follows:                      #
+#                                                                              #
+# I_S.GLOBAL_STATUS                  vs.       P_S.GLOBAL_STATUS               #
+# - Remove SESSION-ONLY                                                        #
+# - Remove SLAVE-ONLY                                                          #
+#                                                                              #
+# I_S.SESSION_STATUS                 vs.       P_S.SESSION_STATUS              #
+# - Remove GLOBAL-only vars                                                    #
+# - Remove SLAVE-ONLY                                                          #
+#                                                                              #
+# P_S.SESSION_STATUS                 vs.       P_S.STATUS_BY_USER/HOST/ACCOUNT #
+#                                              - Remove SESSION-ONLY           #  
+#                                              - Remove non-aggregatable       #
+#                                                                              #
+################################################################################
+--source include/have_perfschema.inc
+--source include/not_embedded.inc
+--source include/no_protocol.inc
+
+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';
+
+# Debug
+# select connection_id(), @my_tid, @my_user, @my_host;
+# show plugins
+--echo #
+--echo # ================================================================================
+--echo # SHOW_COMPATIBILITY_56 = ON
+--echo # ================================================================================
+set global show_compatibility_56 = on;
+
+--echo #
+--echo # STEP 1-1
+insert into test.sanity
+  select "5.6", "I_S.GLOBAL_VARIABLES", variable_name
+  from information_schema.global_variables;
+
+--echo #
+--echo # STEP 1-2
+insert into test.sanity
+  select "5.6", "I_S.SESSION_VARIABLES", variable_name
+  from information_schema.session_variables;
+
+--echo #
+--echo # STEP 1-3
+insert into test.sanity
+  select "5.6", "P_S.GLOBAL_VARIABLES", variable_name
+  from performance_schema.global_variables;
+
+--echo #
+--echo # 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;
+
+--echo #
+--echo # STEP 1-5
+insert into test.sanity
+  select "5.6", "P_S.SESSION_VARIABLES", variable_name
+  from performance_schema.session_variables;
+
+--echo #
+--echo # STEP 1-6
+insert into test.sanity
+  select "5.6", "I_S.GLOBAL_STATUS", variable_name
+  from information_schema.global_status;
+
+--echo #
+--echo # STEP 1-7
+insert into test.sanity
+  select "5.6", "I_S.SESSION_STATUS", variable_name
+  from information_schema.session_status;
+
+--echo #
+--echo # STEP 1-8
+insert into test.sanity
+  select "5.6", "P_S.GLOBAL_STATUS", variable_name
+  from performance_schema.global_status;
+
+--echo #
+--echo # STEP 1-9
+--echo # EMPTY, NO WARNINGS (not available in 5.6 mode)
+select *
+  from performance_schema.status_by_thread;
+
+--echo #
+--echo # STEP 1-10
+insert into test.sanity
+  select "5.6", "P_S.SESSION_STATUS", variable_name
+  from performance_schema.session_status;
+
+--echo #
+--echo # STEP 1-11
+--echo # EMPTY, NO WARNINGS (not available in 5.6 mode)
+select *
+  from performance_schema.status_by_account;
+
+--echo #
+--echo # STEP 1-12
+--echo # EMPTY, NO WARNINGS (not available in 5.6 mode)
+select *
+  from performance_schema.status_by_user;
+
+--echo #
+--echo # STEP 1-13
+--echo # EMPTY, NO WARNINGS (not available in 5.6 mode)
+select *
+  from performance_schema.status_by_host;
+
+--echo #
+--echo # ================================================================================
+--echo # SHOW_COMPATIBILITY_56 = OFF
+--echo # ================================================================================
+set global show_compatibility_56 = off;
+
+--echo #
+--echo # STEP 2-1
+--echo # FAILS WITH ERROR
+--error ER_FEATURE_DISABLED_SEE_DOC
+select *
+  from information_schema.global_variables;
+
+--echo #
+--echo # STEP 2-2
+--echo # FAILS WITH ERROR
+--error ER_FEATURE_DISABLED_SEE_DOC
+select *
+  from information_schema.session_variables;
+
+--echo #
+--echo # STEP 2-3
+insert into test.sanity
+  select "5.7", "P_S.GLOBAL_VARIABLES", variable_name
+  from performance_schema.global_variables;
+
+--echo #
+--echo # 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;
+
+--echo #
+--echo # STEP 2-5
+insert into test.sanity
+  select "5.7", "P_S.SESSION_VARIABLES", variable_name
+  from performance_schema.session_variables;
+
+--echo #
+--echo # STEP 2-6
+--echo # FAILS WITH ERROR
+--error ER_FEATURE_DISABLED_SEE_DOC
+select *
+  from information_schema.global_status;
+
+--echo #
+--echo # STEP 2-7
+--echo # FAILS WITH ERROR
+--error ER_FEATURE_DISABLED_SEE_DOC
+select *
+  from information_schema.session_status;
+
+--echo #
+--echo # STEP 2-8
+insert into test.sanity
+  select "5.7", "P_S.GLOBAL_STATUS", variable_name
+  from performance_schema.global_status;
+
+--echo #
+--echo # 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;
+
+--echo #
+--echo # STEP 2-10
+insert into test.sanity
+  select "5.7", "P_S.SESSION_STATUS", variable_name
+  from performance_schema.session_status;
+
+--echo #
+--echo # 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;
+
+--echo #
+--echo # 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;
+
+--echo #
+--echo # 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;
+
+--echo #
+--echo # STEP 2-14
+--echo # Known global variables in 5.6 that should not display in session queries.
+--echo # These should be global-only system variables.
+--disable_query_log
+insert into test.sanity values
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "AUTO_GENERATE_CERTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "AUTOMATIC_SP_PRIVILEGES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "AVOID_TEMPORAL_UPGRADE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BACK_LOG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BASEDIR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BIND_ADDRESS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BINLOGGING_IMPOSSIBLE_MODE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BINLOG_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BINLOG_CHECKSUM"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BINLOG_ERROR_ACTION"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BINLOG_GROUP_COMMIT_SYNC_DELAY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BINLOG_GROUP_COMMIT_SYNC_NO_DELAY_COUNT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BINLOG_GTID_SIMPLE_RECOVERY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BINLOG_MAX_FLUSH_QUEUE_TIME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BINLOG_ORDER_COMMITS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "BINLOG_STMT_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "CHARACTER_SETS_DIR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "CHARACTER_SET_SYSTEM"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "CHECK_PROXY_USERS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "CONCURRENT_INSERT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "CONNECT_TIMEOUT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "CORE_FILE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DATADIR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DATETIME_FORMAT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DATE_FORMAT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DEFAULT_AUTHENTICATION_PLUGIN"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DEFAULT_PASSWORD_LIFETIME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DELAYED_INSERT_LIMIT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DELAYED_INSERT_TIMEOUT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DELAYED_QUEUE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DELAY_KEY_WRITE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DISABLED_STORAGE_ENGINES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "DISCONNECT_ON_EXPIRED_PASSWORD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "ENFORCE_GTID_CONSISTENCY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "EVENT_SCHEDULER"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "EXECUTED_GTIDS_COMPRESSION_PERIOD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "EXPIRE_LOGS_DAYS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "FLUSH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "FLUSH_TIME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "FT_BOOLEAN_SYNTAX"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "FT_MAX_WORD_LEN"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "FT_MIN_WORD_LEN"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "FT_QUERY_EXPANSION_LIMIT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "FT_STOPWORD_FILE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "GENERAL_LOG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "GENERAL_LOG_FILE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "GTID_EXECUTED_COMPRESSION_PERIOD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "GTID_MODE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "GTID_PURGED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_COMPRESS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_CRYPT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_DYNAMIC_LOADING"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_GEOMETRY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_OPENSSL"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_PROFILING"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_QUERY_CACHE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_RTREE_KEYS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_SSL"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_STATEMENT_TIMEOUT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HAVE_SYMLINK"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HOSTNAME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "HOST_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "IGNORE_BUILTIN_INNODB"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "IGNORE_DB_DIRS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INIT_CONNECT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INIT_FILE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INIT_SLAVE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ADAPTIVE_FLUSHING"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ADAPTIVE_FLUSHING_LWM"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FLUSH_SYNC"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ADAPTIVE_HASH_INDEX"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ADAPTIVE_HASH_INDEX_PARTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ADAPTIVE_MAX_SLEEP_DELAY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_AUTOEXTEND_INCREMENT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_AUTOINC_LOCK_MODE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BACKGROUND_DROP_LIST_EMPTY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_CHUNK_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_DUMP_AT_SHUTDOWN"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_DUMP_NOW"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_DUMP_PCT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_EVICT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_FILENAME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_LOAD_ABORT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_LOAD_AT_STARTUP"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_LOAD_NOW"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUFFER_POOL_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_BUF_FLUSH_LIST_NOW"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CHANGE_BUFFERING"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CHANGE_BUFFERING_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CHANGE_BUFFER_MAX_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CHECKSUMS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CHECKSUM_ALGORITHM"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CMP_PER_INDEX_ENABLED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_COMMIT_CONCURRENCY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_COMPRESS_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_COMPRESSION_FAILURE_THRESHOLD_PCT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_COMPRESSION_LEVEL"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_COMPRESSION_PAD_PCT_MAX"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_CONCURRENCY_TICKETS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DATA_FILE_PATH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DATA_HOME_DIR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DEFAULT_ROW_FORMAT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DICT_STATS_DISABLED_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DISABLE_BACKGROUND_MERGE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DISABLE_RESIZE_BUFFER_POOL_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DISABLE_SORT_FILE_CACHE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_DOUBLEWRITE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FAST_SHUTDOWN"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FILE_PER_TABLE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FILL_FACTOR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FIL_MAKE_PAGE_DIRTY_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FLUSHING_AVG_LOOPS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FLUSH_LOG_AT_TIMEOUT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FLUSH_LOG_AT_TRX_COMMIT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FLUSH_METHOD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FLUSH_NEIGHBORS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FORCE_LOAD_CORRUPTED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FORCE_RECOVERY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FT_AUX_TABLE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FT_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FT_ENABLE_DIAG_PRINT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FT_MAX_TOKEN_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FT_MIN_TOKEN_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FT_NUM_WORD_OPTIMIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FT_RESULT_CACHE_LIMIT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FT_SERVER_STOPWORD_TABLE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FT_SORT_PLL_DEGREE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_FT_TOTAL_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_IO_CAPACITY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_IO_CAPACITY_MAX"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LARGE_PREFIX"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOCKS_UNSAFE_FOR_BINLOG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_BUFFER_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_CHECKPOINT_NOW"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_CHECKSUMS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_COMPRESSED_PAGES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_FILES_IN_GROUP"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_FILE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_GROUP_HOME_DIR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LOG_WRITE_AHEAD_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_LRU_SCAN_DEPTH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MASTER_THREAD_DISABLED_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MAX_DIRTY_PAGES_PCT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MAX_DIRTY_PAGES_PCT_LWM"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MAX_PURGE_LAG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MAX_PURGE_LAG_DELAY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MAX_UNDO_LOG_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MERGE_THRESHOLD_SET_ALL_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MONITOR_DISABLE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MONITOR_ENABLE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MONITOR_RESET"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_MONITOR_RESET_ALL"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_NUMA_INTERLEAVE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_OLD_BLOCKS_PCT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_OLD_BLOCKS_TIME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ONLINE_ALTER_LOG_MAX_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_OPEN_FILES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_OPTIMIZE_FULLTEXT_ONLY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_PAGE_CLEANERS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_PAGE_CLEANER_DISABLED_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_PAGE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_PRINT_ALL_DEADLOCKS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_PURGE_BATCH_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_PURGE_RSEG_TRUNCATE_FREQUENCY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_PURGE_THREADS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_RANDOM_READ_AHEAD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_READ_AHEAD_THRESHOLD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_READ_IO_THREADS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_READ_ONLY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_REPLICATION_DELAY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ROLLBACK_ON_TIMEOUT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_ROLLBACK_SEGMENTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SAVED_PAGE_NUMBER_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SEMAPHORE_WAIT_TIMEOUT_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SORT_BUFFER_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SPIN_WAIT_DELAY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_STATS_AUTO_RECALC"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_STATS_METHOD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_STATS_ON_METADATA"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_STATS_PERSISTENT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_STATS_PERSISTENT_SAMPLE_PAGES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_STATS_SAMPLE_PAGES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_STATS_TRANSIENT_SAMPLE_PAGES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_STATUS_OUTPUT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_STATUS_OUTPUT_LOCKS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SYNC_ARRAY_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SYNC_SPIN_LOOPS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_SYNC_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_TEMP_DATA_FILE_PATH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_THREAD_CONCURRENCY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_THREAD_SLEEP_DELAY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_TRX_PURGE_VIEW_UPDATE_ONLY_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_TRX_RSEG_N_SLOTS_DEBUG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_UNDO_DIRECTORY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_UNDO_LOG_TRUNCATE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_UNDO_LOGS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_UNDO_TABLESPACES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_USE_NATIVE_AIO"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_VERSION"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INNODB_WRITE_IO_THREADS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "INTERNAL_TMP_DISK_STORAGE_ENGINE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "KEY_BUFFER_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "KEY_CACHE_AGE_THRESHOLD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "KEY_CACHE_BLOCK_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "KEY_CACHE_DIVISION_LIMIT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LARGE_FILES_SUPPORT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LARGE_PAGES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LARGE_PAGE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LC_MESSAGES_DIR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LICENSE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOCAL_INFILE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOCKED_IN_MEMORY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_BIN"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_BIN_BASENAME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_BIN_INDEX"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_BIN_TRUST_FUNCTION_CREATORS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_BIN_USE_V1_ROW_EVENTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_BUILTIN_AS_IDENTIFIED_BY_PASSWORD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_ERROR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_ERROR_VERBOSITY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_OUTPUT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_QUERIES_NOT_USING_INDEXES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_SLAVE_UPDATES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_SLOW_ADMIN_STATEMENTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_SLOW_SLAVE_STATEMENTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_SYSLOG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_SYSLOG_FACILITY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_SYSLOG_INCLUDE_PID"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_SYSLOG_TAG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_THROTTLE_QUERIES_NOT_USING_INDEXES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_TIMESTAMPS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOG_WARNINGS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOWER_CASE_FILE_SYSTEM"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "LOWER_CASE_TABLE_NAMES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MASTER_INFO_REPOSITORY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MASTER_VERIFY_CHECKSUM"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MAX_BINLOG_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MAX_BINLOG_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MAX_BINLOG_STMT_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MAX_CONNECTIONS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MAX_CONNECT_ERRORS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MAX_DIGEST_LENGTH"),  
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MAX_PREPARED_STMT_COUNT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MAX_RELAY_LOG_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MAX_WRITE_LOCK_COUNT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "METADATA_LOCKS_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "METADATA_LOCKS_HASH_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MYISAM_DATA_POINTER_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MYISAM_MAX_SORT_FILE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MYISAM_MMAP_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MYISAM_RECOVER_OPTIONS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MYISAM_USE_MMAP"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "MYSQL_NATIVE_PASSWORD_PROXY_USERS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NAMED_PIPE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NAMED_PIPE_FULL_ACCESS_GROUP"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NDBINFO_DATABASE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NDBINFO_OFFLINE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NDBINFO_TABLE_PREFIX"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NDBINFO_VERSION"),      
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "NGRAM_TOKEN_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "OFFLINE_MODE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "OLD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "OPEN_FILES_LIMIT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_ACCOUNTS_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_DIGESTS_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_LONG_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_EVENTS_STAGES_HISTORY_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_LONG_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_EVENTS_STATEMENTS_HISTORY_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_LONG_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_EVENTS_TRANSACTIONS_HISTORY_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_LONG_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_EVENTS_WAITS_HISTORY_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_HOSTS_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_COND_CLASSES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_COND_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_DIGEST_LENGTH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_FILE_CLASSES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_FILE_HANDLES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_FILE_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_INDEX_STAT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_MEMORY_CLASSES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_METADATA_LOCKS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_MUTEX_CLASSES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_MUTEX_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_PREPARED_STATEMENTS_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_PROGRAM_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_RWLOCK_CLASSES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_RWLOCK_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_SOCKET_CLASSES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_SOCKET_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_SQL_TEXT_LENGTH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_STAGE_CLASSES"),  
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_STATEMENT_CLASSES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_STATEMENT_STACK"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_TABLE_HANDLES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_TABLE_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_TABLE_LOCK_STAT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_THREAD_CLASSES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_MAX_THREAD_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_SETUP_ACTORS_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_SETUP_OBJECTS_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PERFORMANCE_SCHEMA_USERS_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PID_FILE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PLUGIN_DIR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PORT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "PROTOCOL_VERSION"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "QUERY_CACHE_LIMIT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "QUERY_CACHE_MIN_RES_UNIT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "QUERY_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "READ_ONLY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "RELAY_LOG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "RELAY_LOG_BASENAME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "RELAY_LOG_INDEX"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "RELAY_LOG_INFO_FILE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "RELAY_LOG_INFO_REPOSITORY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "RELAY_LOG_PURGE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "RELAY_LOG_RECOVERY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "RELAY_LOG_SPACE_LIMIT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "REPORT_HOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "REPORT_PASSWORD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "REPORT_PORT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "REPORT_USER"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "RPL_STOP_SLAVE_TIMEOUT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SECURE_AUTH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SECURE_FILE_PRIV"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SERVER_ID"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SERVER_ID_BITS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SERVER_UUID"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SHA256_PASSWORD_AUTO_GENERATE_RSA_KEYS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SHA256_PASSWORD_PRIVATE_KEY_PATH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SHA256_PASSWORD_PUBLIC_KEY_PATH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SHARED_MEMORY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SHARED_MEMORY_BASE_NAME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SHA256_PASSWORD_PROXY_USERS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SHOW_COMPATIBILITY_56"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SIMPLIFIED_BINLOG_GTID_RECOVERY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SKIP_EXTERNAL_LOCKING"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SKIP_NAME_RESOLVE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SKIP_NETWORKING"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SKIP_SHOW_DATABASE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_ALLOW_BATCHING"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_CHECKPOINT_GROUP"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_CHECKPOINT_PERIOD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_COMPRESSED_PROTOCOL"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_EXEC_MODE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_LOAD_TMPDIR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_MAX_ALLOWED_PACKET"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_NET_TIMEOUT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_PARALLEL_TYPE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_PARALLEL_WORKERS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_PENDING_JOBS_SIZE_MAX"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_PRESERVE_COMMIT_ORDER"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_ROWS_SEARCH_ALGORITHMS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_SKIP_ERRORS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_SQL_VERIFY_CHECKSUM"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_TRANSACTION_RETRIES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLAVE_TYPE_CONVERSIONS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLOW_LAUNCH_TIME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLOW_QUERY_LOG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SLOW_QUERY_LOG_FILE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SOCKET"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SQL_SLAVE_SKIP_COUNTER"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SSL_CA"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SSL_CAPATH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SSL_CERT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SSL_CIPHER"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SSL_CRL"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SSL_CRLPATH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SSL_KEY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SUPER_READ_ONLY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "STORED_PROGRAM_CACHE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SYNC_BINLOG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SYNC_FRM"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SYNC_MASTER_INFO"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SYNC_RELAY_LOG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SYNC_RELAY_LOG_INFO"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "SYSTEM_TIME_ZONE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "TABLE_DEFINITION_CACHE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "TABLE_OPEN_CACHE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "TABLE_OPEN_CACHE_INSTANCES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "THREAD_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "THREAD_HANDLING"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "THREAD_STACK"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "TIME_FORMAT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "TMPDIR"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "VERSION"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "VERSION_COMMENT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "VERSION_COMPILE_MACHINE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "VERSION_COMPILE_OS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_VARIABLES", "REQUIRE_SECURE_TRANSPORT")
+;
+--enable_query_log
+
+--echo #
+--echo # STEP 2-15
+--echo # Known global status in 5.6 that should not exist in session queries.
+--echo # These should be global-only status variables.
+--disable_query_log
+insert into test.sanity values
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "ABORTED_CLIENTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "ABORTED_CONNECTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "BINLOG_CACHE_DISK_USE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "BINLOG_CACHE_USE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "BINLOG_STMT_CACHE_DISK_USE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "BINLOG_STMT_CACHE_USE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "CONNECTIONS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "CONNECTION_ERRORS_ACCEPT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "CONNECTION_ERRORS_INTERNAL"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "CONNECTION_ERRORS_MAX_CONNECTIONS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "CONNECTION_ERRORS_PEER_ADDRESS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "CONNECTION_ERRORS_SELECT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "CONNECTION_ERRORS_TCPWRAP"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "CREATED_TMP_FILES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "DELAYED_ERRORS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "DELAYED_INSERT_THREADS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "DELAYED_WRITES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "FLUSH_COMMANDS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_AHI_DROP_LOOKUPS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_AVAILABLE_UNDO_LOGS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_BYTES_DATA"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_BYTES_DIRTY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_DUMP_STATUS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_LOAD_STATUS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_PAGES_DATA"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_PAGES_DIRTY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_PAGES_FLUSHED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_PAGES_FREE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_PAGES_LATCHED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_PAGES_MISC"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_PAGES_TOTAL"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_READS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_READ_AHEAD"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_READ_AHEAD_EVICTED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_READ_AHEAD_RND"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_READ_REQUESTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_RESIZE_STATUS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_WAIT_FREE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_BUFFER_POOL_WRITE_REQUESTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_DATA_FSYNCS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_DATA_PENDING_FSYNCS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_DATA_PENDING_READS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_DATA_PENDING_WRITES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_DATA_READ"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_DATA_READS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_DATA_WRITES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_DATA_WRITTEN"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_DBLWR_PAGES_WRITTEN"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_DBLWR_WRITES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_HAVE_ATOMIC_BUILTINS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_LOG_WAITS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_LOG_WRITES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_LOG_WRITE_REQUESTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_NUM_OPEN_FILES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_OS_LOG_FSYNCS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_OS_LOG_PENDING_FSYNCS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_OS_LOG_PENDING_WRITES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_OS_LOG_WRITTEN"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_PAGES_CREATED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_PAGES_READ"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_PAGES_WRITTEN"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_PAGE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_PURGE_TRX_ID_AGE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_PURGE_VIEW_TRX_ID_AGE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_ROWS_DELETED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_ROWS_INSERTED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_ROWS_READ"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_ROWS_UPDATED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_ROW_LOCK_CURRENT_WAITS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_ROW_LOCK_TIME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_ROW_LOCK_TIME_AVG"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_ROW_LOCK_TIME_MAX"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_ROW_LOCK_WAITS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "INNODB_TRUNCATED_STATUS_WRITES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "KEY_BLOCKS_NOT_FLUSHED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "KEY_BLOCKS_UNUSED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "KEY_BLOCKS_USED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "KEY_READS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "KEY_READ_REQUESTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "KEY_WRITES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "KEY_WRITE_REQUESTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "LOCKED_CONNECTS"),  
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "MAX_USED_CONNECTIONS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "MAX_USED_CONNECTIONS_TIME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "NOT_FLUSHED_DELAYED_ROWS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "OPENED_FILES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "OPEN_FILES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "OPEN_STREAMS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "OPEN_TABLE_DEFINITIONS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "ONGOING_ANONYMOUS_GTID_VIOLATING_TRANSACTION_COUNT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "ONGOING_ANONYMOUS_TRANSACTION_COUNT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "ONGOING_AUTOMATIC_GTID_VIOLATING_TRANSACTION_COUNT"),    
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_ACCOUNTS_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_COND_CLASSES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_COND_INSTANCES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_DIGEST_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_FILE_CLASSES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_FILE_HANDLES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_FILE_INSTANCES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_INDEX_STAT_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_HOSTS_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_LOCKER_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_MEMORY_CLASSES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_METADATA_LOCK_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_MUTEX_CLASSES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_MUTEX_INSTANCES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_NESTED_STATEMENT_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_PREPARED_STATEMENTS_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_PROGRAM_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_RWLOCK_CLASSES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_RWLOCK_INSTANCES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_SESSION_CONNECT_ATTRS_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_SOCKET_CLASSES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_SOCKET_INSTANCES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_STAGE_CLASSES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_STATEMENT_CLASSES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_TABLE_HANDLES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_TABLE_INSTANCES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_THREAD_CLASSES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_THREAD_INSTANCES_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PERFORMANCE_SCHEMA_USERS_LOST"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "PREPARED_STMT_COUNT"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "QCACHE_FREE_BLOCKS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "QCACHE_FREE_MEMORY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "QCACHE_HITS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "QCACHE_INSERTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "QCACHE_LOWMEM_PRUNES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "QCACHE_NOT_CACHED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "QCACHE_QUERIES_IN_CACHE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "QCACHE_TOTAL_BLOCKS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "RSA_PUBLIC_KEY"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SLAVE_OPEN_TEMP_TABLES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SLAVE_ROWS_LAST_SEARCH_ALGORITHM_USED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_ACCEPTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_ACCEPT_RENEGOTIATES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_CALLBACK_CACHE_HITS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_CLIENT_CONNECTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_CONNECT_RENEGOTIATES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_CTX_VERIFY_DEPTH"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_CTX_VERIFY_MODE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_FINISHED_ACCEPTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_FINISHED_CONNECTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_SESSION_CACHE_HITS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_SESSION_CACHE_MISSES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_SESSION_CACHE_MODE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_SESSION_CACHE_OVERFLOWS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_SESSION_CACHE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_SESSION_CACHE_TIMEOUTS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "SSL_USED_SESSION_CACHE_ENTRIES"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "TABLE_LOCKS_IMMEDIATE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "TABLE_LOCKS_WAITED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "TC_LOG_MAX_PAGES_USED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "TC_LOG_PAGE_SIZE"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "TC_LOG_PAGE_WAITS"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "THREADS_CACHED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "THREADS_CONNECTED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "THREADS_CREATED"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "THREADS_RUNNING"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "UPTIME"),
+  ("JUNK: GLOBAL-ONLY", "I_S.SESSION_STATUS", "UPTIME_SINCE_FLUSH_STATUS")
+;
+--enable_query_log
+
+--echo #
+--echo # STEP 2-15A
+--echo # COM counters appear in I_S.SESSION_STATUS, but not in P_S.SESSION_STATUS
+--disable_query_log
+insert into test.sanity values
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ADMIN_COMMANDS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ALTER_DB"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ALTER_DB_UPGRADE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ALTER_EVENT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ALTER_FUNCTION"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ALTER_INSTANCE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ALTER_PROCEDURE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ALTER_SERVER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ALTER_TABLE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ALTER_TABLESPACE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ALTER_USER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ANALYZE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ASSIGN_TO_KEYCACHE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_BEGIN"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_BINLOG"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CALL_PROCEDURE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CHANGE_DB"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CHANGE_MASTER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CHANGE_REPL_FILTER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CHECK"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CHECKSUM"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_COMMIT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_DB"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_EVENT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_FUNCTION"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_INDEX"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_PROCEDURE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_SERVER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_TABLE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_TRIGGER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_UDF"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_USER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_CREATE_VIEW"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DEALLOC_SQL"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DELETE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DELETE_MULTI"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DO"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DROP_DB"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DROP_EVENT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DROP_FUNCTION"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DROP_INDEX"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DROP_PROCEDURE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DROP_SERVER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DROP_TABLE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DROP_TRIGGER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DROP_USER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_DROP_VIEW"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_EMPTY_QUERY"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_EXECUTE_SQL"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_EXPLAIN_OTHER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_FLUSH"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_GET_DIAGNOSTICS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_GROUP_REPLICATION_START"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_GROUP_REPLICATION_STOP"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_GRANT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_HA_CLOSE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_HA_OPEN"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_HA_READ"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_HELP"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_INSERT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_INSERT_SELECT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_INSTALL_PLUGIN"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_KILL"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_LOAD"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_LOCK_TABLES"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_OPTIMIZE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_PRELOAD_KEYS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_PREPARE_SQL"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_PURGE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_PURGE_BEFORE_DATE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_RELEASE_SAVEPOINT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_RENAME_TABLE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_RENAME_USER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_REPAIR"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_REPLACE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_REPLACE_SELECT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_RESET"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_RESIGNAL"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_REVOKE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_REVOKE_ALL"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ROLLBACK"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_ROLLBACK_TO_SAVEPOINT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SAVEPOINT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SELECT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SET_OPTION"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_BINLOGS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_BINLOG_EVENTS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_CHARSETS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_COLLATIONS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_CREATE_DB"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_CREATE_EVENT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_CREATE_FUNC"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_CREATE_PROC"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_CREATE_TABLE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_CREATE_TRIGGER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_CREATE_USER"),  
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_DATABASES"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_ENGINE_LOGS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_ENGINE_MUTEX"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_ENGINE_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_ERRORS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_EVENTS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_FIELDS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_FUNCTION_CODE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_FUNCTION_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_GRANTS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_KEYS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_MASTER_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_OPEN_TABLES"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_PLUGINS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_PRIVILEGES"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_PROCEDURE_CODE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_PROCEDURE_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_PROCESSLIST"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_PROFILE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_PROFILES"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_RELAYLOG_EVENTS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_SLAVE_HOSTS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_SLAVE_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_SLAVE_STATUS_NONBLOCKING"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_STORAGE_ENGINES"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_TABLES"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_TABLE_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_TRIGGERS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_VARIABLES"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SHOW_WARNINGS"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SIGNAL"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SLAVE_START"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_SLAVE_STOP"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_STMT_CLOSE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_STMT_EXECUTE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_STMT_FETCH"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_STMT_PREPARE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_STMT_RESET"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_STMT_SEND_LONG_DATA"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_TRUNCATE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_UNINSTALL_PLUGIN"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_UNLOCK_TABLES"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_UPDATE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_UPDATE_MULTI"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_XA_COMMIT"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_XA_END"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_XA_PREPARE"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_XA_RECOVER"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_XA_ROLLBACK"),
+  ("JUNK: COM COUNTER", "I_S.SESSION_STATUS", "COM_XA_START")
+;
+
+--enable_query_log
+
+--echo #
+--echo # STEP 2-15B
+--echo # 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")
+;
+
+--echo #
+--echo # STEP 2-16
+--echo # 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")
+;
+
+--echo #
+--echo # STEP 2-16A
+--echo # COM counters appear in I_S.GLOBAL_STATUS but not in P_S.GLOBAL_STATUS
+--disable_query_log
+insert into test.sanity values
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ADMIN_COMMANDS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ALTER_DB"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ALTER_DB_UPGRADE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ALTER_EVENT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ALTER_FUNCTION"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ALTER_INSTANCE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ALTER_PROCEDURE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ALTER_SERVER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ALTER_TABLE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ALTER_TABLESPACE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ALTER_USER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ANALYZE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ASSIGN_TO_KEYCACHE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_BEGIN"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_BINLOG"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CALL_PROCEDURE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CHANGE_DB"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CHANGE_MASTER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CHANGE_REPL_FILTER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CHECK"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CHECKSUM"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_COMMIT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_DB"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_EVENT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_FUNCTION"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_INDEX"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_PROCEDURE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_SERVER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_TABLE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_TRIGGER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_UDF"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_USER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_CREATE_VIEW"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DEALLOC_SQL"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DELETE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DELETE_MULTI"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DO"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DROP_DB"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DROP_EVENT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DROP_FUNCTION"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DROP_INDEX"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DROP_PROCEDURE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DROP_SERVER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DROP_TABLE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DROP_TRIGGER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DROP_USER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_DROP_VIEW"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_EMPTY_QUERY"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_EXECUTE_SQL"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_EXPLAIN_OTHER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_FLUSH"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_GET_DIAGNOSTICS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_GRANT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_GROUP_REPLICATION_START"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_GROUP_REPLICATION_STOP"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_HA_CLOSE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_HA_OPEN"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_HA_READ"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_HELP"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_INSERT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_INSERT_SELECT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_INSTALL_PLUGIN"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_KILL"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_LOAD"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_LOCK_TABLES"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_OPTIMIZE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_PRELOAD_KEYS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_PREPARE_SQL"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_PURGE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_PURGE_BEFORE_DATE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_RELEASE_SAVEPOINT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_RENAME_TABLE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_RENAME_USER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_REPAIR"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_REPLACE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_REPLACE_SELECT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_RESET"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_RESIGNAL"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_REVOKE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_REVOKE_ALL"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ROLLBACK"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_ROLLBACK_TO_SAVEPOINT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SAVEPOINT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SELECT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SET_OPTION"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_BINLOGS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_BINLOG_EVENTS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_CHARSETS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_COLLATIONS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_CREATE_DB"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_CREATE_EVENT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_CREATE_FUNC"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_CREATE_PROC"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_CREATE_TABLE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_CREATE_TRIGGER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_CREATE_USER"),  
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_DATABASES"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_ENGINE_LOGS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_ENGINE_MUTEX"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_ENGINE_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_ERRORS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_EVENTS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_FIELDS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_FUNCTION_CODE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_FUNCTION_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_GRANTS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_KEYS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_MASTER_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_OPEN_TABLES"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_PLUGINS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_PRIVILEGES"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_PROCEDURE_CODE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_PROCEDURE_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_PROCESSLIST"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_PROFILE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_PROFILES"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_RELAYLOG_EVENTS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_SLAVE_HOSTS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_SLAVE_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_SLAVE_STATUS_NONBLOCKING"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_STORAGE_ENGINES"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_TABLES"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_TABLE_STATUS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_TRIGGERS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_VARIABLES"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SHOW_WARNINGS"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SIGNAL"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SLAVE_START"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_SLAVE_STOP"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_STMT_CLOSE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_STMT_EXECUTE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_STMT_FETCH"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_STMT_PREPARE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_STMT_RESET"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_STMT_SEND_LONG_DATA"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_TRUNCATE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_UNINSTALL_PLUGIN"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_UNLOCK_TABLES"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_UPDATE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_UPDATE_MULTI"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_XA_COMMIT"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_XA_END"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_XA_PREPARE"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_XA_RECOVER"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_XA_ROLLBACK"),
+  ("JUNK: COM COUNTER", "I_S.GLOBAL_STATUS", "COM_XA_START")
+ ;
+
+--enable_query_log
+
+--echo #
+--echo # STEP 2-16B
+--echo # 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")
+;
+
+--echo #
+--echo # STEP 2-17
+--echo # Status variables that should not exist in queries that aggregate across threads.
+--echo # 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")
+;
+
+#Debug
+#select * from test.sanity order by show_mode, source, variable_name;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 1A
+--echo # Present in 5.6 P_S.GLOBAL_VARIABLES (1-3)
+--echo # Missing in 5.6 I_S.GLOBAL_VARIABLES (1-1)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 1B
+--echo # Present in 5.7 P_S.GLOBAL_VARIABLES (2-3)
+--echo # Missing in 5.6 I_S.GLOBAL_VARIABLES (1-1)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 2A
+--echo # Present in 5.6 I_S.GLOBAL_VARIABLES (1-1)
+--echo # Missing in 5.6 P_S.GLOBAL_VARIABLES (1-3)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 2B
+--echo # Present in 5.6 I_S.GLOBAL_VARIABLES (1-1)
+--echo # Missing in 5.7 P_S.GLOBAL_VARIABLES (2-3)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 3A
+--echo # Present in 5.6 P_S.SESSION_VARIABLES (1-5)
+--echo # Missing in 5.6 I_S.SESSION_VARIABLES (1-2)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 3B
+--echo # Present in 5.7 P_S.SESSION_VARIABLES (2-5)
+--echo # Missing in 5.6 I_S.SESSION_VARIABLES (1-2)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 4A
+--echo # Present in 5.6 I_S.SESSION_VARIABLES (1-2)
+--echo # Missing in 5.6 P_S.SESSION_VARIABLES (1-5)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 4B
+--echo # Present in 5.6 I_S.SESSION_VARIABLES (1-2)
+--echo # Missing in 5.7 P_S.SESSION_VARIABLES (2-5)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 5A
+--echo # Present in 5.6 P_S.VARIABLES_BY_THREAD (1-4)
+--echo # Missing in 5.6 I_S.SESSION_VARIABLES (1-2)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 5B
+--echo # Present in 5.7 P_S.VARIABLES_BY_THREAD (2-4)
+--echo # Missing in 5.6 I_S.SESSION_VARIABLES (1-2)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 5C
+--echo # Present in 5.6 I_S.SESSION_VARIABLES (1-2)
+--echo # Missing in 5.6 P_S.VARIABLES_BY_THREAD (1-4)
+--echo # EXPECT NOTHING BESIDE KNOWN GLOBAL VARIABLES (2-14)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 5D
+--echo # Present in 5.6 I_S.SESSION_VARIABLES (1-2)
+--echo # Missing in 5.7 P_S.VARIABLES_BY_THREAD (2-5)
+--echo # EXPECT NOTHING BESIDE KNOWN GLOBAL VARIABLES (2-14)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 5E
+--echo # KNOWN GLOBAL VARIABLES (2-14)
+--echo # Expect missing in 5.6 P_S.VARIABLES_BY_THREAD (1-4)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 5F
+--echo # KNOWN GLOBAL VARIABLES (2-14)
+--echo # Expect missing in 5.7 P_S.VARIABLES_BY_THREAD (2-5)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 6A
+--echo # Present in 5.7 P_S.GLOBAL_STATUS (2-8)
+--echo # Missing in 5.6 I_S.GLOBAL_STATUS (1-6)
+--echo # EXPECT NOTHING
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 6B
+--echo # Present in 5.7 P_S.GLOBAL_STATUS (2-8)
+--echo # Missing in 5.6 P_S.GLOBAL_STATUS (1-8)
+--echo # EXPECT NOTHING
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 6C
+--echo # Present in 5.6 P_S.GLOBAL_STATUS (1-8)
+--echo # Missing in 5.7 P_S.GLOBAL_STATUS (2-8)
+--echo # EXPECT NOTHING
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 7
+--echo # Present in 5.6 I_S.GLOBAL_STATUS (1-6)
+--echo # Missing in 5.7 P_S.GLOBAL_STATUS (2-8)
+--echo # EXPECT NOTHING AFTER REMOVING KNOWN SESSION-ONLY, COM COUNTERS AND SLAVE-ONLY (2-16 & 2-16A & 2-16B)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 8
+--echo # KNOWN SESSION-ONLY (2-16)
+--echo # KNOWN COM COUNTERS (2-16A)
+--echo # KNOWN SLAVE-ONLY (2-16B)
+--echo # Status variables that should NOT be present in 5.7 P_S.GLOBAL_STATUS (2-8)
+--echo # EXPECT NOTHING
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 9A
+--echo # Present in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # Missing in 5.6 I_S.SESSION_STATUS (1-7)
+--echo # EXPECT NOTHING
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 9B
+--echo # Present in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # Missing in 5.6 P_S.SESSION_STATUS (1-10)
+--echo # EXPECT NOTHING
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 9C
+--echo # Present in 5.6 P_S.SESSION_STATUS (1-10)
+--echo # Missing in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # EXPECT NOTHING
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 10
+--echo # Present in 5.6 I_S.SESSION_STATUS (1-7)
+--echo # Missing in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # EXPECT NOTHING AFTER REMOVING KNOWN COM COUNTERS AND SLAVE-ONLY (2-15A & 2-15B)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 11
+--echo # KNOWN COM COUNTERS (2-15A)
+--echo # KNOWN SLAVE-ONLY (2-15B)
+--echo # Status variables that should NOT be present in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # EXPECT NOTHING
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 12
+--echo # Present in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # Missing in 5.7 P_S.STATUS_BY_THREAD
+--echo # EXPECT NOTHING AFTER REMOVING KNOWN GLOBAL-ONLY (2-15)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 13
+--echo # Present in 5.7 P_S.STATUS_BY_THREAD
+--echo # Missing in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # EXPECT NOTHING
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 14
+--echo # Present in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # Missing in 5.7 P_S.STATUS_BY_ACCOUNT
+--echo # EXPECT NOTHING AFTER REMOVING
+--echo # - KNOWN GLOBAL-ONLY (2-15)
+--echo # - STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 15
+--echo # Present in 5.7 P_S.STATUS_BY_ACCOUNT
+--echo # Missing in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # EXPECT NOTHING
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 16
+--echo # KNOWN STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+--echo # Status variables that should NOT be present in 5.7 P_S.STATUS_BY_ACCOUNT
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 17
+--echo # Present in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # Missing in 5.7 P_S.STATUS_BY_USER
+--echo # EXPECT NOTHING AFTER REMOVING
+--echo # - KNOWN GLOBAL-ONLY (2-15)
+--echo # - STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 18
+--echo # Present in 5.7 P_S.STATUS_BY_USER
+--echo # Missing in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 19
+--echo # KNOWN STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+--echo # Status variables that should NOT be present in 5.7 P_S.STATUS_BY_USER
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 20
+--echo # Present in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # Missing in 5.7 P_S.STATUS_BY_HOST
+--echo # EXPECT NOTHING AFTER REMOVING
+--echo # - KNOWN GLOBAL-ONLY (2-15)
+--echo # - STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 21
+--echo # Present in 5.7 P_S.STATUS_BY_HOST
+--echo # Missing in 5.7 P_S.SESSION_STATUS (2-10)
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # TEST 22
+--echo # KNOWN STATUS VARS THAT CAN'T BE AGGREGATED (2-17)
+--echo # Status variables that should NOT be present in 5.7 P_S.STATUS_BY_HOST
+--echo # ================================================================================
+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;
+
+--echo #
+--echo # ================================================================================
+--echo # CLEAN UP
+--echo # ================================================================================
+set @@global.show_compatibility_56 = @show_compatibility_56_save;
+drop table test.sanity;
+
+
diff --git a/mysql-test/suite/perfschema/t/sizing_default.cnf b/mysql-test/suite/perfschema/t/sizing_default.cnf
deleted file mode 100644
index 0515832d41c..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_default.cnf
+++ /dev/null
@@ -1,39 +0,0 @@
-
-!include suite/perfschema/include/default_mysqld_autosize.cnf
-
-[mysqld.1]
-
-# Default values used in the server, out of the box
-# open_files_limit can be scaled down based on the os configuration (ulimit -n),
-# so to get a stable test output, make sure ulimit -n is big enough
-#
-# What is supposed to happen here by default:
-# table_open_cache = 2000
-# table_definition_cache = 400 + 2000/2 = 1400
-# max_connections = 151
-
-# Automated sizing for everything
-
-loose-enable-performance-schema
-
-loose-performance-schema-accounts-size=-1
-loose-performance-schema-digests-size=-1
-loose-performance-schema-hosts-size=-1
-loose-performance-schema-users-size=-1
-
-loose-performance-schema-events-waits-history-size=-1
-loose-performance-schema-events-waits-history-long-size=-1
-loose-performance-schema-events-stages-history-size=-1
-loose-performance-schema-events-stages-history-long-size=-1
-loose-performance-schema-events-statements-history-size=-1
-loose-performance-schema-events-statements-history-long-size=-1
-
-loose-performance-schema-max-mutex-instances=-1
-loose-performance-schema-max-rwlock-instances=-1
-loose-performance-schema-max-cond-instances=-1
-loose-performance-schema-max-file-instances=-1
-loose-performance-schema-max-socket-instances=-1
-loose-performance-schema-max-thread-instances=-1
-loose-performance-schema-max-table-instances=-1
-loose-performance-schema-max-table-handles=-1
-
diff --git a/mysql-test/suite/perfschema/t/sizing_default.test b/mysql-test/suite/perfschema/t/sizing_default.test
deleted file mode 100644
index f8086cc7afd..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_default.test
+++ /dev/null
@@ -1,29 +0,0 @@
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
---source include/have_64bit.inc
---source include/not_valgrind.inc
---source ../include/have_aligned_memory.inc
-
-#SELECT @@open_files_limit, @@table_open_cache, @@table_definition_cache, @@max_connections;
-#exit;
-
-# Skip test if not defaults is used.
-if (`SELECT @@open_files_limit < 1024`)
-{
-  skip Need open_files_limit to be at least 1024;
-}
-if (`SELECT @@table_open_cache != 421`)
-{
-  skip Need table_open_cache to be exactly 421;
-}
-if (`SELECT @@table_definition_cache != 400`)
-{
-  skip Need table_definition_cache to be exactly 400;
-}
-if (`SELECT @@max_connections != 151`)
-{
-  skip Need max_connections to be exactly 151;
-}
-
---source ../include/sizing_auto.inc
diff --git a/mysql-test/suite/perfschema/t/sizing_growth-master.opt b/mysql-test/suite/perfschema/t/sizing_growth-master.opt
deleted file mode 100644
index 69f0f157f70..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_growth-master.opt
+++ /dev/null
@@ -1,3 +0,0 @@
---force-restart
---innodb_file_per_table=1
-
diff --git a/mysql-test/suite/perfschema/t/sizing_growth.test b/mysql-test/suite/perfschema/t/sizing_growth.test
deleted file mode 100644
index d6944d2aee0..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_growth.test
+++ /dev/null
@@ -1,478 +0,0 @@
-# Tests for PERFORMANCE_SCHEMA
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
-
-#
-# Important note:
-# this test is extremely sensitive to how threads are running inside the server,
-# so it has it's own -master.opt file, to enforce it runs alone in mysqld
-#
-
-# Setup
-
-flush status;
-flush tables;
-
-# Remove to debug
---disable_result_log
-
-# Make sure the internal server caches are all full
-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;
-
-# Make sure there is at least 1 table handle,
-# to fully initialize the storage engine share if needed.
-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;
-
-connect (con1, localhost, root,,);
-select "con1 connected";
-
-connect (con2, localhost, root,,);
-select "con2 connected";
-
-connect (con3, localhost, root,,);
-select "con3 connected";
-
-connect (con4, localhost, root,,);
-select "con4 connected";
-
-connect (con5, localhost, root,,);
-select "con5 connected";
-
-connect (con6, localhost, root,,);
-select "con6 connected";
-
-connect (con7, localhost, root,,);
-select "con7 connected";
-
-connect (con8, localhost, root,,);
-select "con8 connected";
-
-connect (con9, localhost, root,,);
-select "con9 connected";
-
-connect (con10, localhost, root,,);
-select "con10 connected";
-
-connection default;
-
-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;
-
---connection con1
-
-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;
-
---send
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-  from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-
---connection con2
-
---send
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-  from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-
---connection con3
-
---send
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-  from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-
---connection con4
-
---send
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-  from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-
---connection con5
-
---send
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-  from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-
---connection con6
-
---send
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-  from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-
---connection con7
-
---send
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-  from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-
---connection con8
-
---send
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-  from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-
---connection con9
-
---send
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-  from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-
---connection con10
-
---send
-select t1.*, t2.*, t3.*, t4.*, t5.*, t6.*, t7.*, t8.*, t9.*, t10.*
-  from t1, t2, t3, t4, t5, t6, t7, t8, t9, t10;
-
-connection default;
-
-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;
-
---connection con1
---reap
-
-unlock tables;
-
---connection con2
---reap
-
---connection con3
---reap
-
---connection con4
---reap
-
---connection con5
---reap
-
---connection con6
---reap
-
---connection con7
---reap
-
---connection con8
---reap
-
---connection con9
---reap
-
---connection con10
---reap
-
---disconnect con1
---disconnect con2
---disconnect con3
---disconnect con4
---disconnect con5
---disconnect con6
---disconnect con7
---disconnect con8
---disconnect con9
---disconnect con10
-
---connection default
-
-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;
-
---enable_result_log
-
-#
-# This test must have *_lost = 0,
-# otherwise the measurement is just wrong.
-#
-
-show status like "performance_schema%";
-
-#
-# Expecting 2:
-# - wait/synch/mutex/sql/MDL_wait::LOCK_wait_status
-# - wait/synch/mutex/sql/TABLE_SHARE::LOCK_ha_data
-# plus mutexes used inside the storage engine
-# This is very storage engine dependent
-# For innodb:
-# - wait/synch/mutex/innodb/autoinc_mutex
-# - wait/synch/mutex/innodb/os_mutex
-# Note that depending on the platform,
-# and the version of the compiler used,
-# code in the server may use either native platform atomics
-# or a mutex.
-# Note also that in DEBUG builds, code uses more mutexes.
-# Because of all these parameters,
-# this test is disabled, as predicting an exact number is difficult.
-# 
-# commented: select @mutex_per_share <= 5;
-
-#
-# Expecting 1:
-# - wait/synch/rwlock/sql/MDL_lock::rwlock
-# plus rwlocks used inside the storage engine
-# This is very storage engine dependent
-#
-select @rwlock_per_share <= 3;
-
-#
-# Expecting 0:
-#
-select @cond_per_share;
-
-#
-# Expecting 1:
-# - wait/io/file/sql/FRM
-# plus files used inside the storage engine
-# This is very storage engine dependent
-#
-select @file_per_share <= 3;
-
-#
-# Expecting 3:
-# - wait/synch/mutex/mysys/my_thread_var::mutex
-# - wait/synch/mutex/mysys/THR_LOCK::mutex
-# - wait/synch/mutex/sql/THD::LOCK_thd_data
-#
-select @mutex_per_con;
-
-#
-# Expecting 1:
-# - wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for
-#
-select @rwlock_per_con;
-
-#
-# Expecting 2:
-# - wait/synch/cond/mysys/my_thread_var::suspend
-# - wait/synch/cond/sql/MDL_context::COND_wait_status
-#
-select @cond_per_con;
-
-#
-# Expecting 0:
-#
-select @file_per_con;
-
-#
-# Expecting 0:
-#
-select @mutex_per_handle;
-
-#
-# Expecting 0:
-#
-select @rwlock_per_handle;
-
-#
-# Expecting 0:
-#
-select @cond_per_handle;
-
-#
-# Expecting 0:
-#
-select @file_per_handle;
-
-#
-# IMPORTANT NOTE:
-# when any measurement here changes, the heuristics
-# in storage/perfschema/pfs_autosize.cc need to be updated.
-# Note that this in turns will lead to different estimations for automated
-# sizing, and imply to update the results for sizing_*.
-#
-
-# commented: (@mutex_per_share <= 5)
-# Mutexes are not instrumented by default,
-# not enforcing mutex estimates
-
-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;
-
diff --git a/mysql-test/suite/perfschema/t/sizing_high.cnf b/mysql-test/suite/perfschema/t/sizing_high.cnf
deleted file mode 100644
index 519ad79f3ad..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_high.cnf
+++ /dev/null
@@ -1,57 +0,0 @@
-
-!include suite/perfschema/include/default_mysqld_autosize.cnf
-
-[mysqld.1]
-
-# WARNING about open_files_limit and ulimit -n
-#
-# mysqld checks how many files can be opened on the machine,
-# and this is by definition very:
-# - os dependent, see OS_FILE_LIMIT, HAVE_GETRLIMIT
-# - configuration dependent, for each machine (ulimit -n), see
-#   my_set_max_open_files() in mysys/my_file.c,
-#   see getrlimit(RLIMIT_NOFILE)
-#
-# Based on the this, the server tunes _down_ max_connections and
-# table_cache_size to match the open_files_limit found,
-# which significantly interfere with this test.
-#
-# Solution: use a big table definition cache,
-# but small values for max_connection and table_open_cache,
-# to stay within open_files_limit of 1024.
-#
-# This is the best test we can do that has a chance to pass on all
-# platforms, while still providing code coverage.
-
-table_definition_cache=5000
-table_open_cache=400
-max_connections=200
-open_files_limit=1024
-
-# 10+max_connections+table_cache_size*2 = 10 + 200 + 400*2 = 1010
-# max_connections*5 = 200*5 = 1000
-
-# Automated sizing for everything
-loose-enable-performance-schema
-
-loose-performance-schema-accounts-size=-1
-loose-performance-schema-digests-size=-1
-loose-performance-schema-hosts-size=-1
-loose-performance-schema-users-size=-1
-
-loose-performance-schema-events-waits-history-size=-1
-loose-performance-schema-events-waits-history-long-size=-1
-loose-performance-schema-events-stages-history-size=-1
-loose-performance-schema-events-stages-history-long-size=-1
-loose-performance-schema-events-statements-history-size=-1
-loose-performance-schema-events-statements-history-long-size=-1
-
-loose-performance-schema-max-mutex-instances=-1
-loose-performance-schema-max-rwlock-instances=-1
-loose-performance-schema-max-cond-instances=-1
-loose-performance-schema-max-file-instances=-1
-loose-performance-schema-max-socket-instances=-1
-loose-performance-schema-max-thread-instances=-1
-loose-performance-schema-max-table-instances=-1
-loose-performance-schema-max-table-handles=-1
-
diff --git a/mysql-test/suite/perfschema/t/sizing_high.test b/mysql-test/suite/perfschema/t/sizing_high.test
deleted file mode 100644
index 4d02d41aecd..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_high.test
+++ /dev/null
@@ -1,9 +0,0 @@
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
---source include/have_64bit.inc
---source include/not_valgrind.inc
---source ../include/have_aligned_memory.inc
-
---source ../include/sizing_auto.inc
-
diff --git a/mysql-test/suite/perfschema/t/sizing_low.cnf b/mysql-test/suite/perfschema/t/sizing_low.cnf
deleted file mode 100644
index 79e891bda60..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_low.cnf
+++ /dev/null
@@ -1,34 +0,0 @@
-
-!include suite/perfschema/include/default_mysqld_autosize.cnf
-
-[mysqld.1]
-
-table_definition_cache=400
-table_open_cache=100
-max_connections=50
-open_files_limit=1024
-
-# Automated sizing for everything
-loose-enable-performance-schema
-
-loose-performance-schema-accounts-size=-1
-loose-performance-schema-digests-size=-1
-loose-performance-schema-hosts-size=-1
-loose-performance-schema-users-size=-1
-
-loose-performance-schema-events-waits-history-size=-1
-loose-performance-schema-events-waits-history-long-size=-1
-loose-performance-schema-events-stages-history-size=-1
-loose-performance-schema-events-stages-history-long-size=-1
-loose-performance-schema-events-statements-history-size=-1
-loose-performance-schema-events-statements-history-long-size=-1
-
-loose-performance-schema-max-mutex-instances=-1
-loose-performance-schema-max-rwlock-instances=-1
-loose-performance-schema-max-cond-instances=-1
-loose-performance-schema-max-file-instances=-1
-loose-performance-schema-max-socket-instances=-1
-loose-performance-schema-max-thread-instances=-1
-loose-performance-schema-max-table-instances=-1
-loose-performance-schema-max-table-handles=-1
-
diff --git a/mysql-test/suite/perfschema/t/sizing_low.test b/mysql-test/suite/perfschema/t/sizing_low.test
deleted file mode 100644
index 56446fd6973..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_low.test
+++ /dev/null
@@ -1,10 +0,0 @@
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
---source include/have_64bit.inc
---source include/not_valgrind.inc
---source ../include/have_aligned_memory.inc
-
---source ../include/sizing_auto.inc
-
-CALL mtr.add_suppression("innodb_open_files should not be greater than the open_files_limit.");
diff --git a/mysql-test/suite/perfschema/t/sizing_med.cnf b/mysql-test/suite/perfschema/t/sizing_med.cnf
deleted file mode 100644
index 4a113272e38..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_med.cnf
+++ /dev/null
@@ -1,34 +0,0 @@
-
-!include suite/perfschema/include/default_mysqld_autosize.cnf
-
-[mysqld.1]
-
-table_definition_cache=401
-table_open_cache=401
-max_connections=152
-open_files_limit=1024
-
-# Automated sizing for everything
-loose-enable-performance-schema
-
-loose-performance-schema-accounts-size=-1
-loose-performance-schema-digests-size=-1
-loose-performance-schema-hosts-size=-1
-loose-performance-schema-users-size=-1
-
-loose-performance-schema-events-waits-history-size=-1
-loose-performance-schema-events-waits-history-long-size=-1
-loose-performance-schema-events-stages-history-size=-1
-loose-performance-schema-events-stages-history-long-size=-1
-loose-performance-schema-events-statements-history-size=-1
-loose-performance-schema-events-statements-history-long-size=-1
-
-loose-performance-schema-max-mutex-instances=-1
-loose-performance-schema-max-rwlock-instances=-1
-loose-performance-schema-max-cond-instances=-1
-loose-performance-schema-max-file-instances=-1
-loose-performance-schema-max-socket-instances=-1
-loose-performance-schema-max-thread-instances=-1
-loose-performance-schema-max-table-instances=-1
-loose-performance-schema-max-table-handles=-1
-
diff --git a/mysql-test/suite/perfschema/t/sizing_med.test b/mysql-test/suite/perfschema/t/sizing_med.test
deleted file mode 100644
index 4d02d41aecd..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_med.test
+++ /dev/null
@@ -1,9 +0,0 @@
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
---source include/have_64bit.inc
---source include/not_valgrind.inc
---source ../include/have_aligned_memory.inc
-
---source ../include/sizing_auto.inc
-
diff --git a/mysql-test/suite/perfschema/t/sizing_off.cnf b/mysql-test/suite/perfschema/t/sizing_off.cnf
deleted file mode 100644
index 80c00494791..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_off.cnf
+++ /dev/null
@@ -1,38 +0,0 @@
-
-!include suite/perfschema/include/default_mysqld_autosize.cnf
-
-[mysqld.1]
-
-# Default values used in the server, out of the box
-table_definition_cache=400
-table_open_cache=400
-max_connections=151
-open_files_limit=1024
-
-# Disable the performacne schema.
-# Sizing does not occur then
-loose-skip-performance-schema
-
-# Automated sizing for everything
-
-loose-performance-schema-accounts-size=-1
-loose-performance-schema-digests-size=-1
-loose-performance-schema-hosts-size=-1
-loose-performance-schema-users-size=-1
-
-loose-performance-schema-events-waits-history-size=-1
-loose-performance-schema-events-waits-history-long-size=-1
-loose-performance-schema-events-stages-history-size=-1
-loose-performance-schema-events-stages-history-long-size=-1
-loose-performance-schema-events-statements-history-size=-1
-loose-performance-schema-events-statements-history-long-size=-1
-
-loose-performance-schema-max-mutex-instances=-1
-loose-performance-schema-max-rwlock-instances=-1
-loose-performance-schema-max-cond-instances=-1
-loose-performance-schema-max-file-instances=-1
-loose-performance-schema-max-socket-instances=-1
-loose-performance-schema-max-thread-instances=-1
-loose-performance-schema-max-table-instances=-1
-loose-performance-schema-max-table-handles=-1
-
diff --git a/mysql-test/suite/perfschema/t/sizing_off.test b/mysql-test/suite/perfschema/t/sizing_off.test
deleted file mode 100644
index 32729918bd1..00000000000
--- a/mysql-test/suite/perfschema/t/sizing_off.test
+++ /dev/null
@@ -1,8 +0,0 @@
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
-
-show variables where
-    `Variable_name` != "performance_schema_max_statement_classes" and
-    `Variable_name` like "performance_schema%";
-show status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/t/socket_connect.test b/mysql-test/suite/perfschema/t/socket_connect.test
index b4579605eb5..4ae9608cd0e 100644
--- a/mysql-test/suite/perfschema/t/socket_connect.test
+++ b/mysql-test/suite/perfschema/t/socket_connect.test
@@ -57,9 +57,9 @@ let $ip_localhost=
 --echo # 1.0 Get the default connection object_instance_begin, thread id and verify
 --echo #     the expected number of client connections.
 --echo #==============================================================================
---echo
+--echo #
 --echo # 1.1 Confirm only one client connection
---echo
+--echo #
 eval $count_client_connections;
 
 if (`SELECT @my_client_connections != 1`)
@@ -70,15 +70,15 @@ if (`SELECT @my_client_connections != 1`)
   exit;
 }
 
---echo
+--echo #
 --echo # 1.2 Get the default THREAD_ID;
---echo
+--echo #
 eval $get_thread_id;
 let $default_thread_id= `SELECT @my_thread_id`;
 
---echo
+--echo #
 --echo # 1.3 Get the default OBJECT_INSTANCE_BEGIN
---echo
+--echo #
 eval $get_object_instance_begin;
 let $default_object_instance_begin= `SELECT @my_object_instance_begin`;
 --disable_query_log
@@ -99,19 +99,19 @@ if ($my_socket_debug)
 --connect (con1,$my_localhost,root,,test,,$MASTER_MYPORT)
 --enable_query_log
 
---echo
+--echo #
 --echo # 2.1 Get the connection thread id
---echo
+--echo #
 eval $get_thread_id;
 
---echo
+--echo #
 --echo # 2.2 Get the connection object instance begin
---echo
+--echo #
 eval $get_object_instance_begin;
 
---echo
+--echo #
 --echo # 2.3 Get the connection port
---echo
+--echo #
 eval $get_port;
 
 --disable_query_log
@@ -134,9 +134,9 @@ if ($my_socket_debug)
   --echo # Con1 name2     = $con1_name2
 }
 
---echo
+--echo #
 --echo # 2.4 Verify that the connection is 127.0.0.1 or ::1
---echo
+--echo #
 eval SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -144,17 +144,17 @@ WHERE EVENT_NAME LIKE '%client_connection%'
   AND PORT= @con1_port
   AND OBJECT_INSTANCE_BEGIN= @con1_object_id;
 
---echo
+--echo #
 --echo # 2.5 Verify that the same connection is in the summary instance table
---echo
+--echo #
 eval SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_summary_by_instance
 WHERE EVENT_NAME LIKE '%client_connection%'
   AND OBJECT_INSTANCE_BEGIN= @con1_object_id;
 
---echo
+--echo #
 --echo # Switch to connection default
---echo
+--echo #
 --connection default
 
 --echo #==============================================================================
@@ -165,19 +165,19 @@ WHERE EVENT_NAME LIKE '%client_connection%'
 --connect (con2,$my_localhost,root,,test,,$MASTER_MYPORT)
 --enable_query_log
 
---echo
+--echo #
 --echo # 3.1 Get the connection thread id
---echo
+--echo #
 eval $get_thread_id;
 
---echo
+--echo #
 --echo # 3.2 Get the connection object instance begin
---echo
+--echo #
 eval $get_object_instance_begin;
 
---echo
+--echo #
 --echo # 3.3 Get the connection port
---echo
+--echo #
 eval $get_port;
 
 --disable_query_log
@@ -200,9 +200,9 @@ if ($my_socket_debug)
   --echo # con2 name2     = $con2_name2
 }
 
---echo
+--echo #
 --echo # 3.4 Verify that the connection is 127.0.0.1 or ::1
---echo
+--echo #
 
 eval SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_instances
@@ -211,17 +211,17 @@ WHERE EVENT_NAME LIKE '%client_connection%'
   AND PORT= @con2_port
   AND OBJECT_INSTANCE_BEGIN= @con2_object_id;
 
---echo
+--echo #
 --echo # 3.5 Verify that the same connection is in the summary instance table
---echo
+--echo #
 eval SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_summary_by_instance
 WHERE EVENT_NAME LIKE '%client_connection%'
   AND OBJECT_INSTANCE_BEGIN= @con2_object_id;
 
---echo
+--echo #
 --echo # 3.6 Verify that the connection is 127.0.0.1 or ::1
---echo
+--echo #
 eval SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -234,18 +234,18 @@ WHERE EVENT_NAME LIKE '%client_connection%'
 --echo #==============================================================================
 --connection default
 
---echo
+--echo #
 --echo # 4.1 Verify that there are two TCP/IP connections in the socket instance table
---echo
+--echo #
 eval SELECT COUNT(*) = 2 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
   AND OBJECT_INSTANCE_BEGIN <> @default_object_instance_begin
   AND $ip_localhost;
 
---echo
+--echo #
 --echo # 4.2 Verify that there are two TCP/IP connections in the summary instance table
---echo
+--echo #
 eval SELECT COUNT(*) = 2 AS 'Expect 1'
 FROM performance_schema.socket_summary_by_instance
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -270,9 +270,9 @@ WHERE EVENT_NAME LIKE '%client_connection%'
 --echo # 6.0 Verify sockets were removed from the instance tables
 --echo #==============================================================================
 
---echo
+--echo #
 --echo # 6.1 Verify that there are no TCP/IP connections in the socket instance table
---echo
+--echo #
 let $wait_condition=
 SELECT COUNT(*) = 0 AS 'Expect 1'
 FROM performance_schema.socket_instances
@@ -281,9 +281,9 @@ WHERE EVENT_NAME LIKE '%client_connection%'
   AND $ip_localhost;
 --source include/wait_condition.inc
 
---echo
+--echo #
 --echo # 6.2 Verify that there are no TCP/IP connections in the summary instance table
---echo
+--echo #
 let $wait_condition=
 SELECT COUNT(*) = 0 AS 'Expect 1'
 FROM performance_schema.socket_summary_by_instance
diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
index c6860eb3213..4a6ee2b6277 100644
--- a/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
+++ b/mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
@@ -28,6 +28,8 @@
 # prepared statement.
 --source include/no_protocol.inc
 
+#--source include/turn_off_only_full_group_by.inc
+
 # Set this to enable debugging output
 let $my_socket_debug_dbug= 0;
 
@@ -137,22 +139,22 @@ WHERE t_inst.event_name LIKE '%client%'
 --echo #==============================================================================
 --echo # 1.0 TEST INITIALIZATION
 --echo #==============================================================================
---echo
+--echo #
 --echo # 1.1 Disable instrumentation of the default (this) connection
---echo
+--echo #
 --connection default
 UPDATE performance_schema.threads
   SET INSTRUMENTED='NO' WHERE PROCESSLIST_ID = CONNECTION_ID();
 
---echo
+--echo #
 --echo # 1.2 Get the default THREAD_ID;
---echo
+--echo #
 eval $get_thread_id;
 let $default_thread_id= `SELECT @my_thread_id`;
 
---echo
+--echo #
 --echo # 1.3 Get the default OBJECT_INSTANCE_BEGIN
---echo
+--echo #
 eval $get_object_instance_begin;
 let $default_object_instance_begin= `SELECT @my_object_instance_begin`;
 
@@ -166,50 +168,50 @@ if ($my_socket_debug)
   --echo # Default thread id = $default_thread_id
 }
 
---echo
+--echo #
 --echo # 1.4 Create a test database
---echo
+--echo #
 CREATE SCHEMA mysqltest;
 
---echo
+--echo #
 --echo # 1.5 Create a table to store summary values from socket_summary_by_instance
 --echo        and socket_summary_by_event_name
---echo
+--echo #
 CREATE TABLE mysqltest.my_socket_summary AS
   SELECT * FROM performance_schema.socket_summary_by_instance
   WHERE 1 = 0;
 
---echo
+--echo #
 --echo # 1.6 Drop object_instance_begin from my_socket_summary
---echo
+--echo #
 ALTER TABLE mysqltest.my_socket_summary
   DROP COLUMN OBJECT_INSTANCE_BEGIN;
 
---echo
+--echo #
 --echo # 1.7 Add an auto_inc column to my_socket_summary
---echo
+--echo #
 ALTER TABLE mysqltest.my_socket_summary
   ADD COLUMN (n INT AUTO_INCREMENT, PRIMARY KEY(n));
 
---echo
+--echo #
 --echo # 1.8 Create test tables
---echo
+--echo #
 CREATE TABLE mysqltest.t1 (n INT AUTO_INCREMENT, s1 VARCHAR(1024), PRIMARY KEY(n));
 CREATE TABLE mysqltest.t2 (n INT AUTO_INCREMENT, s1 VARCHAR(1024), PRIMARY KEY(n));
 
 --echo #==============================================================================
 --echo # 2.0 ESTABLISH CLIENT CONNECTIONS
 --echo #==============================================================================
---echo
+--echo #
 --echo # 2.1 Connection 1 (tcp/ip, 127.0.0.1 or ::1)
---echo
+--echo #
 --disable_query_log
 --connect (con1,$my_localhost,root,,,,$MASTER_MYPORT)
 --enable_query_log
 
---echo
+--echo #
 --echo # 2.2 Connection 2 (localhost or unix domain socket)
---echo
+--echo #
 --disable_query_log
 --connect (con2,localhost,root,,,,)
 --enable_query_log
@@ -217,47 +219,47 @@ CREATE TABLE mysqltest.t2 (n INT AUTO_INCREMENT, s1 VARCHAR(1024), PRIMARY KEY(n
 --echo #==============================================================================
 --echo # 3.0 RUN THE TESTS
 --echo #==============================================================================
---echo
+--echo #
 --echo # 3.1 Clear performance schema tables
---echo
+--echo #
 TRUNCATE performance_schema.socket_summary_by_instance;
 TRUNCATE performance_schema.socket_summary_by_event_name;
 
---echo
+--echo #
 --echo # 3.2 Get the 'before' sum of bytes written from socket_summary_by_instance
 --echo       for later comparison to the 'after' byte count as a simple confirmation
 --echo       that the table was updated.
---echo
+--echo #
 --connection default
 eval $get_write_count;
 let $my_count_before= `SELECT @my_write_count`;
 
---echo
+--echo #
 --echo # 3.3 From connection 1, insert one a 1K row of data into t1
---echo
+--echo #
 --connection con1
 USE mysqltest;
 INSERT INTO t1 (s1) VALUES (REPEAT('a', 1024));
 INSERT INTO t1 (s1) SELECT s1 FROM t1;
 
---echo
+--echo #
 --echo # 3.4 From connection 2, insert one a 1K row of data into t2
---echo
+--echo #
 --connection con2
 USE mysqltest;
 INSERT INTO t2 (s1) VALUES (REPEAT('a', 1024));
 INSERT INTO t2 (s1) SELECT s1 FROM t2;
 
---echo
+--echo #
 --echo # 3.5 Get the 'after' sum of bytes written from socket_summary_by_instance
---echo
+--echo #
 --connection default
 eval $get_write_count;
 let $my_count_after= `SELECT @my_write_count`;
 
---echo
+--echo #
 --echo # 3.6 Verify that SUM_NUMBER_OF_BYTES_WRITE increased
---echo
+--echo #
 
 if ($my_count_before >= $my_count_after)
 {
@@ -272,17 +274,17 @@ if ($my_count_before >= $my_count_after)
   exit;
 }
 
---echo
+--echo #
 --echo # socket_summary_by_instance was updated
---echo
+--echo #
 
 --echo #==============================================================================
 --echo # 4.0 VERIFY RESULTS
 --echo #==============================================================================
---echo
+--echo #
 --echo # 4.1 Verify that the totals in socket_summary_by_event_name are
 --echo       consistent with totals in socket_summary_by_instance
---echo
+--echo #
 
 --disable_query_log
 eval $compare_tables_and_verify;
@@ -309,25 +311,27 @@ if (`SELECT @tables_match = 0`)
 --echo # 5.0 Clean up
 --echo #==============================================================================
 
---echo
+--echo #
 --echo # 5.1 Disconnect con1
---echo
+--echo #
 --connection con1
 --disconnect con1
 --source include/wait_until_disconnected.inc
 
---echo
+--echo #
 --echo # 5.2 Disconnect con2
---echo
+--echo #
 --connection con2
 --disconnect con2
 --source include/wait_until_disconnected.inc
 
---echo
+--echo #
 --echo # 5.3 Drop mysqltest
---echo
+--echo #
 --connection default
 DROP DATABASE mysqltest;
 
+#--source include/restore_sql_mode_after_turn_off_only_full_group_by.inc
+
 exit;
 
diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
index 42bcb3e4d70..fc848922667 100644
--- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
+++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
@@ -30,6 +30,7 @@
 # Embedded server does not supprt the performance_schema.
 --source include/not_embedded.inc
 --source include/not_windows.inc
+--source include/no_valgrind_without_big.inc
 --source include/have_perfschema.inc
 
 # The values in the performance_schema tables depend on how much communication
@@ -38,8 +39,6 @@
 # prepared statement.
 --source include/no_protocol.inc
 
-set global session_track_schema=FALSE;
-
 #===================================
 # Set IP address defaults with respect to IPV6 support
 #
@@ -1464,9 +1463,11 @@ if(`SELECT COUNT(*) $part`)
 #     4  6706392    85      3 15509472    117     2 34851168 Connect (con*,localhost,root012345,,mysqltest,,)
 #     4 10543632    89      3 10578744    117     2 39460872 Connect (con*,localhost,root0123456789,,mysqltest,,)
 
---echo # 4.6.1 The SUM_OF_BYTES_WRITE value is the same for all Connects.
+--echo # 4.6.1 The SUM_OF_BYTES_WRITE value depends on length of database
+--echo #       since the database name is written in OK packet.
+--echo #       Hence the value 2.
 #========================================================================
-let $my_rules= COUNT(DISTINCT SUM_NUMBER_OF_BYTES_WRITE) = 1;
+let $my_rules= COUNT(DISTINCT SUM_NUMBER_OF_BYTES_WRITE) = 2;
 let $part=
 FROM mysqltest.socket_summary_by_instance_detail
 WHERE OBJECT_INSTANCE_BEGIN <> @default_object_instance_begin
@@ -1710,5 +1711,3 @@ DROP SCHEMA mysqlsupertest;
 --source include/wait_until_disconnected.inc
 --connection default
 --enable_query_log
-
-set global session_track_schema=DEFAULT;
diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
index 0ecb51af203..2c6a375b688 100644
--- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
+++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
@@ -495,7 +495,10 @@ let $connect_user= root;
 --echo #     length of user name  = 10 character
 --echo #     length of default db = 9 character
 #========================================================================
+SET @orig_sql_mode= @@sql_mode;
+SET sql_mode= (SELECT replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
 GRANT ALL PRIVILEGES ON *.* TO 'root012345'@'localhost';
+SET sql_mode= @orig_sql_mode;
 let $connect_host= localhost;
 let $connect_db= mysqltest;
 let $connect_user= root012345;
@@ -506,7 +509,10 @@ DROP USER 'root012345'@'localhost';
 --echo #     length of user name  = 14 character
 --echo #     length of default db = 9 character
 #========================================================================
+SET @orig_sql_mode= @@sql_mode;
+SET sql_mode= (SELECT replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
 GRANT ALL PRIVILEGES ON *.* to 'root0123456789'@'localhost';
+SET sql_mode= @orig_sql_mode;
 let $connect_host= localhost;
 let $connect_db= mysqltest;
 let $connect_user= root0123456789;
@@ -1473,9 +1479,11 @@ if(`SELECT COUNT(*) $part`)
 #     4  6706392    85      3 15509472    117     2 34851168 Connect (con*,localhost,root012345,,mysqltest,,)
 #     4 10543632    89      3 10578744    117     2 39460872 Connect (con*,localhost,root0123456789,,mysqltest,,)
 
---echo # 4.6.1 The SUM_OF_BYTES_WRITE value is the same for all Connects.
+--echo # 4.6.1 The SUM_OF_BYTES_WRITE value depends on length of database
+--echo #       since the database name is written in OK packet.
+--echo #       Hence the value 2.
 #========================================================================
-let $my_rules= COUNT(DISTINCT SUM_NUMBER_OF_BYTES_WRITE) = 1;
+let $my_rules= COUNT(DISTINCT SUM_NUMBER_OF_BYTES_WRITE) = 2;
 let $part=
 FROM mysqltest.socket_summary_by_instance_detail
 WHERE OBJECT_INSTANCE_BEGIN <> @default_object_instance_begin
diff --git a/mysql-test/suite/perfschema/t/start_server_disable_transactions-master.opt b/mysql-test/suite/perfschema/t/start_server_disable_transactions-master.opt
new file mode 100644
index 00000000000..20f93f92f52
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_disable_transactions-master.opt
@@ -0,0 +1 @@
+--loose-performance-schema-instrument='transaction=OFF'
diff --git a/mysql-test/suite/perfschema/t/start_server_disable_transactions.test b/mysql-test/suite/perfschema/t/start_server_disable_transactions.test
new file mode 100644
index 00000000000..723dd1027c9
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_disable_transactions.test
@@ -0,0 +1,28 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+# Expect no enabled statements instruments
+select * from performance_schema.setup_instruments
+  where name in ('transaction') and enabled='YES';
+
+# Expect no statement statistics collected
+
+select * from performance_schema.events_transactions_summary_global_by_event_name
+  where count_star > 0;
+
+select * from performance_schema.events_transactions_summary_by_thread_by_event_name
+  where count_star > 0;
+
+select * from performance_schema.events_transactions_summary_by_user_by_event_name
+  where count_star > 0;
+
+select * from performance_schema.events_transactions_summary_by_host_by_event_name
+  where count_star > 0;
+
+select * from performance_schema.events_transactions_summary_by_account_by_event_name
+  where count_star > 0;
+
diff --git a/mysql-test/suite/perfschema/t/start_server_innodb.test b/mysql-test/suite/perfschema/t/start_server_innodb.test
index 68a164a0bc1..f190482b7d5 100644
--- a/mysql-test/suite/perfschema/t/start_server_innodb.test
+++ b/mysql-test/suite/perfschema/t/start_server_innodb.test
@@ -8,4 +8,4 @@
 
 # Expecting nothing lost with default parameters
 
-show status like "performance_schema%";
+show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/t/start_server_low_digest_sql_length-master.opt b/mysql-test/suite/perfschema/t/start_server_low_digest_sql_length-master.opt
new file mode 100644
index 00000000000..e6483c360f9
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_low_digest_sql_length-master.opt
@@ -0,0 +1,3 @@
+--thread_stack=655360
+--max_digest_length=10
+--loose-performance_schema_max_sql_text_length=10
diff --git a/mysql-test/suite/perfschema/t/start_server_low_digest_sql_length.test b/mysql-test/suite/perfschema/t/start_server_low_digest_sql_length.test
new file mode 100644
index 00000000000..ce8233a98ce
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_low_digest_sql_length.test
@@ -0,0 +1,23 @@
+# -----------------------------------------------------------------------
+# Tests for the performance schema statement Digests.
+# -----------------------------------------------------------------------
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+
+USE performance_schema;
+truncate table events_statements_history_long;
+
+# -----------------------------------------------------------------------
+# Test to show how the digest behaves with low value of 
+#  - performance_schema_max_digest_length
+#  - performance_schema_max_sql_text_length
+# -----------------------------------------------------------------------
+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;
+
+--echo ####################################
+--echo # QUERYING PS STATEMENT DIGEST
+--echo ####################################
+--sorted_result
+SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
diff --git a/mysql-test/suite/perfschema/t/start_server_low_index-master.opt b/mysql-test/suite/perfschema/t/start_server_low_index-master.opt
new file mode 100644
index 00000000000..29cbfa631c3
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_low_index-master.opt
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance_schema_max_index_stat=34
diff --git a/mysql-test/suite/perfschema/t/start_server_low_index.test b/mysql-test/suite/perfschema/t/start_server_low_index.test
new file mode 100644
index 00000000000..18004e1993c
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_low_index.test
@@ -0,0 +1,181 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_valgrind.inc
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+
+# NOTE : Index stats are manifested during table creation. To force a low index
+# condition, performance_schema_max_index_stat must be set to the number of
+# all system table indexes, plus 1.
+
+#############################
+# Setup database and tables.
+#############################
+--disable_warnings
+drop table if exists db1.t1;
+drop database if exists db1;
+--enable_warnings
+create database db1;
+create table db1.t1 (a int, b char(10) default 'default',
+                         unique key uidx(a));
+
+#######################
+# Execute few queries.
+#######################
+insert into db1.t1 values('1', 'abc');
+insert into db1.t1 values('2', 'abc');
+select * from db1.t1 where a='1';
+
+#####################################################
+# Run few queries on Performance Schema stats tables.
+#####################################################
+# There should be 3 entries in following table. 2 for insert and 1 for select.
+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;
+
+# Stats for 2 indexes (full scan, uidx)
+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;
+
+flush tables;
+
+# Stats for full scan lost
+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;
+
+# Stats for only 1 index, uidx
+# Stats for full scan lost
+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;
+
+# Expect INDEX_STAT lost, we have room for 1 out of 2
+--disable_warnings
+select variable_value > 0 from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+
+# While at it, check that FLUSH STATUS Resets the lost counter
+FLUSH STATUS;
+
+select variable_value from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+--enable_warnings
+
+
+create table db1.t2 (a int, b char(10) default 'default',
+                         unique key uidx(a));
+
+#######################
+# Execute few queries.
+#######################
+insert into db1.t1 values('3', 'abc');
+insert into db1.t1 values('4', 'abc');
+select * from db1.t1 where a='1';
+
+insert into db1.t2 values('1', 'abc');
+insert into db1.t2 values('2', 'abc');
+select * from db1.t2 where a='1';
+
+#####################################################
+# Run few queries on Performance Schema stats 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;
+
+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;
+
+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;
+
+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;
+
+# Expect INDEX_STAT lost
+--disable_warnings
+select variable_value > 0 from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+--enable_warnings
+
+FLUSH STATUS;
+
+
+#####################################################################################
+# Update setup_objects to DISABLE TABLE and check index lost stats after flush tables
+#####################################################################################
+
+update performance_schema.setup_objects set ENABLED='NO' where OBJECT_TYPE='TABLE';
+
+
+
+#######################
+# Execute few queries.
+#######################
+insert into db1.t1 values('5', 'abc');
+insert into db1.t1 values('6', 'abc');
+select * from db1.t1 where a='1';
+
+insert into db1.t2 values('3', 'abc');
+insert into db1.t2 values('4', 'abc');
+select * from db1.t2 where a='1';
+
+# Empty, objects are disabled
+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;
+
+# Empty, objects are disabled
+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;
+
+flush tables;
+
+# Empty, objects are disabled
+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;
+
+# Empty, objects are disabled
+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;
+
+# Do not expect lost counter in INDEX_STAT 
+--disable_warnings
+select variable_value from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+--enable_warnings
+
+###########
+# Cleanup.
+###########
+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/t/start_server_low_table_lock-master.opt b/mysql-test/suite/perfschema/t/start_server_low_table_lock-master.opt
new file mode 100644
index 00000000000..d687f8d04b5
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_low_table_lock-master.opt
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance_schema_max_table_lock_stat=1
diff --git a/mysql-test/suite/perfschema/t/start_server_low_table_lock.test b/mysql-test/suite/perfschema/t/start_server_low_table_lock.test
new file mode 100644
index 00000000000..8f35eb64e2a
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_low_table_lock.test
@@ -0,0 +1,130 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+#############################
+# Setup database and tables.
+#############################
+--disable_warnings
+drop table if exists db1.t1;
+drop database if exists db1;
+--enable_warnings
+create database db1;
+create table db1.t1 (a int, b char(10) default 'default');
+
+#######################
+# Execute few queries.
+#######################
+insert into db1.t1 values('1', 'abc');
+insert into db1.t1 values('2', 'abc');
+select * from db1.t1 where a='1';
+
+#####################################################
+# Run few queries on Performance Schema stats tables.
+#####################################################
+# There should be 3 entries in following table. 2 for insert and 1 for select.
+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;
+
+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;
+
+# Expect no TABLE_LOCK_STAT lost, we have room for 1 table lock for db1.t1
+--disable_warnings
+select variable_value from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
+--enable_warnings
+
+create table db1.t2 (a int, b char(10) default 'default',
+                         unique key uidx(a));
+
+#######################
+# Execute few queries.
+#######################
+insert into db1.t1 values('3', 'abc');
+insert into db1.t1 values('4', 'abc');
+select * from db1.t1 where a='1';
+
+insert into db1.t2 values('1', 'abc');
+insert into db1.t2 values('2', 'abc');
+select * from db1.t2 where a='1';
+
+#####################################################
+# Run few queries on Performance Schema stats 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;
+
+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;
+
+# Expect TABLE_LOCK_STAT lost, we can not keep stats for db1.t2
+--disable_warnings
+select variable_value > 0 from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
+--enable_warnings
+
+flush status;
+
+
+#######################################
+# Update setup_objects to DISABLE TABLE
+#######################################
+
+update performance_schema.setup_objects set ENABLED='NO'
+  where OBJECT_TYPE='TABLE' and OBJECT_SCHEMA="%";
+
+#######################
+# Execute few queries.
+#######################
+insert into db1.t1 values('5', 'abc');
+insert into db1.t1 values('6', 'abc');
+select * from db1.t1 where a='1';
+
+insert into db1.t2 values('3', 'abc');
+insert into db1.t2 values('4', 'abc');
+select * from db1.t2 where a='1';
+
+# Empty, objects are disabled
+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;
+
+flush tables;
+
+# Empty, objects are disabled
+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;
+
+# Do not expect lost counter in TABLE_LOCK_STAT 
+--disable_warnings
+select variable_value from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
+--enable_warnings
+
+###########
+# Cleanup.
+###########
+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/t/start_server_no_account.test b/mysql-test/suite/perfschema/t/start_server_no_account.test
index b9b0c858dfb..563fdbaa1f0 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_account.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_account.test
@@ -6,11 +6,13 @@
 --source ../include/start_server_common.inc
 
 # Expect no records
-show variables like "performance_schema_accounts_size";
+show global variables like "performance_schema_accounts_size";
 
 select count(*) from performance_schema.accounts;
 
 # We lost all the data
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_ACCOUNTS_LOST';
+--enable_warnings
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_cond_class.test b/mysql-test/suite/perfschema/t/start_server_no_cond_class.test
index 31578f80238..8a5cf0f5797 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_cond_class.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_cond_class.test
@@ -6,18 +6,20 @@
 --source ../include/start_server_common.inc
 
 # Expect no classes
-show variables like "performance_schema_max_cond_classes";
+show global variables like "performance_schema_max_cond_classes";
 
 select count(*) from performance_schema.setup_instruments
   where name like "wait/synch/cond/%";
 
 # We lost all the classes
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_COND_CLASSES_LOST';
+--enable_warnings
 
 # Expect no instances
 select count(*) from performance_schema.cond_instances;
 
 # Expect no instances lost
-show status like "performance_schema_cond_instances_lost";
+show global status like "performance_schema_cond_instances_lost";
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_cond_inst.test b/mysql-test/suite/perfschema/t/start_server_no_cond_inst.test
index 03b9b16ef4e..8168ef1024d 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_cond_inst.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_cond_inst.test
@@ -6,21 +6,23 @@
 --source ../include/start_server_common.inc
 
 # Expect classes
-show variables like "performance_schema_max_cond_classes";
+show global variables like "performance_schema_max_cond_classes";
 
 select count(*) > 0 from performance_schema.setup_instruments
   where name like "wait/synch/cond/%";
 
 # Expect no class lost
-show status like "performance_schema_cond_classes_lost";
+show global status like "performance_schema_cond_classes_lost";
 
 # Expect no instances
-show variables like "performance_schema_max_cond_instances";
+show global variables like "performance_schema_max_cond_instances";
 
 select count(*) from performance_schema.cond_instances;
 
 # Expect instances lost
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_COND_INSTANCES_LOST';
+--enable_warnings
 
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_digests.test b/mysql-test/suite/perfschema/t/start_server_no_digests.test
index dbbce662256..605ea1f31ab 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_digests.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_digests.test
@@ -24,7 +24,7 @@ SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 
 
 # Expect no digest
-SHOW VARIABLES LIKE "performance_schema_digests_size";
+SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size";
 SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest;
 
 # Cleanup for Digest
diff --git a/mysql-test/suite/perfschema/t/start_server_no_file_class.test b/mysql-test/suite/perfschema/t/start_server_no_file_class.test
index b2c97ccde1e..74ed465a0d8 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_file_class.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_file_class.test
@@ -6,18 +6,20 @@
 --source ../include/start_server_common.inc
 
 # Expect no classes
-show variables like "performance_schema_max_file_classes";
+show global variables like "performance_schema_max_file_classes";
 
 select count(*) from performance_schema.setup_instruments
   where name like "wait/io/file/%";
 
 # We lost all the classes
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_FILE_CLASSES_LOST';
+--enable_warnings
 
 # Expect no instances
 select count(*) from performance_schema.file_instances;
 
 # Expect no instances lost
-show status like "performance_schema_file_instances_lost";
+show global status like "performance_schema_file_instances_lost";
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_file_inst.test b/mysql-test/suite/perfschema/t/start_server_no_file_inst.test
index d8a7402a948..715fe656cc2 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_file_inst.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_file_inst.test
@@ -6,21 +6,23 @@
 --source ../include/start_server_common.inc
 
 # Expect classes
-show variables like "performance_schema_max_file_classes";
+show global variables like "performance_schema_max_file_classes";
 
 select count(*) > 0 from performance_schema.setup_instruments
   where name like "wait/io/file/%";
 
 # Expect no class lost
-show status like "performance_schema_file_classes_lost";
+show global status like "performance_schema_file_classes_lost";
 
 # Expect no instances
-show variables like "performance_schema_max_file_instances";
+show global variables like "performance_schema_max_file_instances";
 
 select count(*) from performance_schema.file_instances;
 
 # Expect instances lost
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_FILE_INSTANCES_LOST';
+--enable_warnings
 
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_host.test b/mysql-test/suite/perfschema/t/start_server_no_host.test
index e0d3d4b1f0f..5f9dd7067cc 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_host.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_host.test
@@ -6,11 +6,13 @@
 --source ../include/start_server_common.inc
 
 # Expect no records
-show variables like "performance_schema_hosts_size";
+show global variables like "performance_schema_hosts_size";
 
 select count(*) from performance_schema.hosts;
 
 # We lost all the data
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_HOSTS_LOST';
+--enable_warnings
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_index-master.opt b/mysql-test/suite/perfschema/t/start_server_no_index-master.opt
new file mode 100644
index 00000000000..38bbb9efed2
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_index-master.opt
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance_schema_max_index_stat=0
diff --git a/mysql-test/suite/perfschema/t/start_server_no_index.test b/mysql-test/suite/perfschema/t/start_server_no_index.test
new file mode 100644
index 00000000000..8c636cc6163
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_index.test
@@ -0,0 +1,64 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+#############################
+# Setup database and tables.
+#############################
+--disable_warnings
+drop table if exists db1.t1;
+drop database if exists db1;
+--enable_warnings
+create database db1;
+create table db1.t1 (a int, b char(10) default 'default',
+                         unique key uidx(a));
+
+#######################
+# Execute few queries.
+#######################
+insert into db1.t1 values('1', 'abc');
+insert into db1.t1 values('2', 'abc');
+select * from db1.t1 where a='1';
+
+#####################################################
+# Run few queries on Performance Schema stats tables.
+#####################################################
+# There should be 3 entries in following table. 2 for insert and 1 for select.
+# This is because lock stats are still in the table handles
+select COUNT_STAR from performance_schema.table_io_waits_summary_by_table
+       where OBJECT_SCHEMA='db1' and OBJECT_NAME='t1';
+# There should be 1 entry in following table. Thats is for select.
+# This is because lock stats are still in the table handles
+select COUNT_STAR from performance_schema.table_io_waits_summary_by_index_usage
+       where INDEX_NAME!='NULL';
+
+# Now force aggregation by closing table handles
+FLUSH TABLES;
+
+# Stats are now missing
+select COUNT_STAR from performance_schema.table_io_waits_summary_by_table
+       where OBJECT_SCHEMA='db1' and OBJECT_NAME='t1';
+
+# Stats are now missing
+select COUNT_STAR from performance_schema.table_io_waits_summary_by_index_usage
+       where INDEX_NAME!='NULL';
+
+# Expect INDEX_STAT lost
+--disable_warnings
+select variable_value > 0 from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+
+# While at it, check that FLUSH STATUS Resets the lost counter
+FLUSH STATUS;
+
+select variable_value from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_INDEX_STAT_LOST';
+--enable_warnings
+
+###########
+# Cleanup.
+###########
+drop database db1;
diff --git a/mysql-test/suite/perfschema/t/start_server_no_mdl-master.opt b/mysql-test/suite/perfschema/t/start_server_no_mdl-master.opt
new file mode 100644
index 00000000000..93a55af2f9d
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_mdl-master.opt
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance_schema_max_metadata_locks=0
diff --git a/mysql-test/suite/perfschema/t/start_server_no_mdl.test b/mysql-test/suite/perfschema/t/start_server_no_mdl.test
new file mode 100644
index 00000000000..c3d1ca7d791
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_mdl.test
@@ -0,0 +1,23 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+select count(*) from performance_schema.metadata_locks;
+
+# Expect metadata locks lost
+--disable_warnings
+select variable_value > 0 from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_METADATA_LOCK_LOST';
+--enable_warnings
+
+# While at it, check that flush status resets the lost counter
+FLUSH STATUS;
+
+--disable_warnings
+select variable_value from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_METADATA_LOCK_LOST';
+--enable_warnings
+
diff --git a/mysql-test/suite/perfschema/t/start_server_no_memory_class-master.opt b/mysql-test/suite/perfschema/t/start_server_no_memory_class-master.opt
new file mode 100644
index 00000000000..9ff2f77a19e
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_memory_class-master.opt
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance_schema_max_memory_classes=0
diff --git a/mysql-test/suite/perfschema/t/start_server_no_memory_class.test b/mysql-test/suite/perfschema/t/start_server_no_memory_class.test
new file mode 100644
index 00000000000..e14e5f39d7f
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_memory_class.test
@@ -0,0 +1,26 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+# Expect no classes
+show global variables like "performance_schema_max_memory_classes";
+
+# Expect builtin memory classes
+select name from performance_schema.setup_instruments
+  where name like "memory/performance_schema/%"
+  order by name;
+
+# Expect no memory classes
+select count(*) from performance_schema.setup_instruments
+  where name like "memory/%"
+    and name not like "memory/performance_schema/%";
+
+# We lost all the classes
+--disable_warnings
+select variable_value > 0 from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_MEMORY_CLASSES_LOST';
+--enable_warnings
+
diff --git a/mysql-test/suite/perfschema/t/start_server_no_mutex_class.test b/mysql-test/suite/perfschema/t/start_server_no_mutex_class.test
index 43798ecf01f..918d79e9417 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_mutex_class.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_mutex_class.test
@@ -6,18 +6,20 @@
 --source ../include/start_server_common.inc
 
 # Expect no classes
-show variables like "performance_schema_max_mutex_classes";
+show global variables like "performance_schema_max_mutex_classes";
 
 select count(*) from performance_schema.setup_instruments
   where name like "wait/synch/mutex/%";
 
 # We lost all the classes
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_MUTEX_CLASSES_LOST';
+--enable_warnings
 
 # Expect no instances
 select count(*) from performance_schema.mutex_instances;
 
 # Expect no instances lost
-show status like "performance_schema_mutex_instances_lost";
+show global status like "performance_schema_mutex_instances_lost";
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test b/mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test
index bffb8218937..106d5df0307 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test
@@ -6,21 +6,23 @@
 --source ../include/start_server_common.inc
 
 # Expect classes
-show variables like "performance_schema_max_mutex_classes";
+show global variables like "performance_schema_max_mutex_classes";
 
 select count(*) > 0 from performance_schema.setup_instruments
   where name like "wait/synch/mutex/%";
 
 # Expect no class lost
-show status like "performance_schema_mutex_classes_lost";
+show global status like "performance_schema_mutex_classes_lost";
 
 # Expect no instances
-show variables like "performance_schema_max_mutex_instances";
+show global variables like "performance_schema_max_mutex_instances";
 
 select count(*) from performance_schema.mutex_instances;
 
 # Expect instances lost
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_MUTEX_INSTANCES_LOST';
+--enable_warnings
 
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_prepared_stmts_instances-master.opt b/mysql-test/suite/perfschema/t/start_server_no_prepared_stmts_instances-master.opt
new file mode 100644
index 00000000000..5a9501cb6e7
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_prepared_stmts_instances-master.opt
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance_schema_max_prepared_statements_instances=0
diff --git a/mysql-test/suite/perfschema/t/start_server_no_prepared_stmts_instances.test b/mysql-test/suite/perfschema/t/start_server_no_prepared_stmts_instances.test
new file mode 100644
index 00000000000..840b3afdbf3
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_prepared_stmts_instances.test
@@ -0,0 +1,43 @@
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+
+--source ../include/start_server_common.inc
+
+CREATE DATABASE db;
+USE db; 
+
+# Expect no history
+
+show global variables like "performance_schema_max_prepared_statements_instances";
+select count(*) from performance_schema.prepared_statements_instances;
+
+# Valid operation, edge case
+
+truncate table performance_schema.prepared_statements_instances;
+
+# Prepare statements
+--source suite/perfschema/include/prepared_stmts_setup.inc
+
+# check the lost status
+show global status like "%performance_schema_prepared_statements_lost%";
+
+# Execute statements 
+--source suite/perfschema/include/prepared_stmts_execution.inc
+
+# check the lost status
+show global status like "%performance_schema_prepared_statements_lost%";
+
+# deallocate prepared statements 
+--source suite/perfschema/include/prepared_stmts_deallocation.inc
+
+# check the lost status 
+show global status like "%performance_schema_prepared_statements_lost%";
+
+# Flush status now
+flush status;
+
+# status after flush. expect 0.
+show global status like "%performance_schema_prepared_statements_lost%";
+
+DROP DATABASE db; 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test b/mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test
index 3c4f32137cc..e876faabed6 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test
@@ -6,18 +6,20 @@
 --source ../include/start_server_common.inc
 
 # Expect no classes
-show variables like "performance_schema_max_rwlock_classes";
+show global variables like "performance_schema_max_rwlock_classes";
 
 select count(*) from performance_schema.setup_instruments
   where name like "wait/synch/rwlock/%";
 
 # We lost all the classes
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_RWLOCK_CLASSES_LOST';
+--enable_warnings
 
 # Expect no instances
 select count(*) from performance_schema.rwlock_instances;
 
 # Expect no instances lost
-show status like "performance_schema_rwlock_instances_lost";
+show global status like "performance_schema_rwlock_instances_lost";
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test b/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test
index 68cb75ea37e..ace773a6dac 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test
@@ -6,21 +6,23 @@
 --source ../include/start_server_common.inc
 
 # Expect classes
-show variables like "performance_schema_max_rwlock_classes";
+show global variables like "performance_schema_max_rwlock_classes";
 
 select count(*) > 0 from performance_schema.setup_instruments
   where name like "wait/synch/rwlock/%";
 
 # Expect no class lost
-show status like "performance_schema_rwlock_classes_lost";
+show global status like "performance_schema_rwlock_classes_lost";
 
 # Expect no instances
-show variables like "performance_schema_max_rwlock_instances";
+show global variables like "performance_schema_max_rwlock_instances";
 
 select count(*) from performance_schema.rwlock_instances;
 
 # Expect instances lost
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_RWLOCK_INSTANCES_LOST';
+--enable_warnings
 
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_setup_actors.test b/mysql-test/suite/perfschema/t/start_server_no_setup_actors.test
index d1433053df8..970f500815d 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_setup_actors.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_setup_actors.test
@@ -6,7 +6,7 @@
 --source ../include/start_server_common.inc
 
 # Expect no setup_actors
-show variables like "performance_schema_setup_actors_size";
+show global variables like "performance_schema_setup_actors_size";
 
 # Expect no setup_actors
 select count(*) from performance_schema.setup_actors;
diff --git a/mysql-test/suite/perfschema/t/start_server_no_setup_objects.test b/mysql-test/suite/perfschema/t/start_server_no_setup_objects.test
index d46805e5b25..039e963e8d6 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_setup_objects.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_setup_objects.test
@@ -6,7 +6,7 @@
 --source ../include/start_server_common.inc
 
 # Expect no setup_objects
-show variables like "performance_schema_setup_objects_size";
+show global variables like "performance_schema_setup_objects_size";
 
 # Expect no setup_objects
 select count(*) from performance_schema.setup_objects;
diff --git a/mysql-test/suite/perfschema/t/start_server_no_socket_class.test b/mysql-test/suite/perfschema/t/start_server_no_socket_class.test
index ec1a2495413..a956a63ec0d 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_socket_class.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_socket_class.test
@@ -6,18 +6,20 @@
 --source ../include/start_server_common.inc
 
 # Expect no classes
-show variables like "performance_schema_max_socket_classes";
+show global variables like "performance_schema_max_socket_classes";
 
 select count(*) from performance_schema.setup_instruments
   where name like "wait/io/socket/%";
 
 # We lost all the classes
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_SOCKET_CLASSES_LOST';
+--enable_warnings
 
 # Expect no instances
 select count(*) from performance_schema.socket_instances;
 
 # Expect no instances lost
-show status like "performance_schema_socket_instances_lost";
+show global status like "performance_schema_socket_instances_lost";
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_socket_inst.test b/mysql-test/suite/perfschema/t/start_server_no_socket_inst.test
index 752a1666550..0202869dd9d 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_socket_inst.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_socket_inst.test
@@ -6,21 +6,23 @@
 --source ../include/start_server_common.inc
 
 # Expect classes
-show variables like "performance_schema_max_socket_classes";
+show global variables like "performance_schema_max_socket_classes";
 
 select count(*) > 0 from performance_schema.setup_instruments
   where name like "wait/io/socket/%";
 
 # Expect no class lost
-show status like "performance_schema_socket_classes_lost";
+show global status like "performance_schema_socket_classes_lost";
 
 # Expect no instances
-show variables like "performance_schema_max_socket_instances";
+show global variables like "performance_schema_max_socket_instances";
 
 select count(*) from performance_schema.socket_instances;
 
 # Expect instances lost
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_SOCKET_INSTANCES_LOST';
+--enable_warnings
 
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_stage_class.test b/mysql-test/suite/perfschema/t/start_server_no_stage_class.test
index 23d22ac5431..d0a9d8acb63 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_stage_class.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_stage_class.test
@@ -6,14 +6,16 @@
 --source ../include/start_server_common.inc
 
 # Expect no classes
-show variables like "performance_schema_max_stage_classes";
+show global variables like "performance_schema_max_stage_classes";
 
 select count(*) from performance_schema.setup_instruments
   where name like "stage/%";
 
 # We lost all the classes
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_STAGE_CLASSES_LOST';
+--enable_warnings
 
 # Expect no stages
 select count(*) from performance_schema.events_stages_current;
diff --git a/mysql-test/suite/perfschema/t/start_server_no_stages_history.test b/mysql-test/suite/perfschema/t/start_server_no_stages_history.test
index 1f5df187646..fca9b5f6cfd 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_stages_history.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_stages_history.test
@@ -6,7 +6,7 @@
 --source ../include/start_server_common.inc
 
 # Expect no history
-show variables like "performance_schema_events_stages_history_size";
+show global variables like "performance_schema_events_stages_history_size";
 select count(*) from performance_schema.events_stages_history;
 
 # Valid operation, edge case
diff --git a/mysql-test/suite/perfschema/t/start_server_no_stages_history_long.test b/mysql-test/suite/perfschema/t/start_server_no_stages_history_long.test
index 84c227790c9..282e396ac00 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_stages_history_long.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_stages_history_long.test
@@ -6,7 +6,7 @@
 --source ../include/start_server_common.inc
 
 # Expect no history long
-show variables like "performance_schema_events_stages_history_long_size";
+show global variables like "performance_schema_events_stages_history_long_size";
 select count(*) from performance_schema.events_stages_history_long;
 
 # Valid operation, edge case
diff --git a/mysql-test/suite/perfschema/t/start_server_no_statement_class.test b/mysql-test/suite/perfschema/t/start_server_no_statement_class.test
index 71deb85680a..fa80d328484 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_statement_class.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_statement_class.test
@@ -6,14 +6,16 @@
 --source ../include/start_server_common.inc
 
 # Expect no classes
-show variables like "performance_schema_max_statement_classes";
+show global variables like "performance_schema_max_statement_classes";
 
 select count(*) from performance_schema.setup_instruments
   where name like "statement/%";
 
 # We lost all the classes
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_STATEMENT_CLASSES_LOST';
+--enable_warnings
 
 # Expect no statements
 select count(*) from performance_schema.events_statements_current;
diff --git a/mysql-test/suite/perfschema/t/start_server_no_statements_history.test b/mysql-test/suite/perfschema/t/start_server_no_statements_history.test
index 625e0bb3cd3..e87a59dd676 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_statements_history.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_statements_history.test
@@ -6,7 +6,7 @@
 --source ../include/start_server_common.inc
 
 # Expect no history
-show variables like "performance_schema_events_statements_history_size";
+show global variables like "performance_schema_events_statements_history_size";
 select count(*) from performance_schema.events_statements_history;
 
 # Valid operation, edge case
diff --git a/mysql-test/suite/perfschema/t/start_server_no_statements_history_long.test b/mysql-test/suite/perfschema/t/start_server_no_statements_history_long.test
index a8d551cbed0..c14df52a24f 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_statements_history_long.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_statements_history_long.test
@@ -6,7 +6,7 @@
 --source ../include/start_server_common.inc
 
 # Expect no history long
-show variables like "performance_schema_events_statements_history_long_size";
+show global variables like "performance_schema_events_statements_history_long_size";
 select count(*) from performance_schema.events_statements_history_long;
 
 # Valid operation, edge case
diff --git a/mysql-test/suite/perfschema/t/start_server_no_table_hdl.test b/mysql-test/suite/perfschema/t/start_server_no_table_hdl.test
index 80553f11866..87c4173ccb6 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_table_hdl.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_table_hdl.test
@@ -6,10 +6,10 @@
 --source ../include/start_server_common.inc
 
 # Expect instances
-show variables like "performance_schema_max_table_instances";
+show global variables like "performance_schema_max_table_instances";
 
 # Expect no handles
-show variables like "performance_schema_max_table_handles";
+show global variables like "performance_schema_max_table_handles";
 
 # Create an instrumented table
 --disable_warnings
@@ -22,9 +22,11 @@ select * from test.instrument_me;
 drop table test.instrument_me;
 
 # Expect no instances lost
-show variables like "performance_schema_max_table_instances";
+show global variables like "performance_schema_max_table_instances";
 
 # We lost all the handles
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_TABLE_HANDLES_LOST';
+--enable_warnings
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_table_inst-master.opt b/mysql-test/suite/perfschema/t/start_server_no_table_inst-master.opt
index 50abd1264f5..57145166385 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_table_inst-master.opt
+++ b/mysql-test/suite/perfschema/t/start_server_no_table_inst-master.opt
@@ -1,2 +1,4 @@
 --loose-enable-performance-schema
 --loose-performance_schema_max_table_instances=0
+--loose-performance_schema_max_index_stat=0
+--loose-performance_schema_max_table_lock_stat=0
diff --git a/mysql-test/suite/perfschema/t/start_server_no_table_inst.test b/mysql-test/suite/perfschema/t/start_server_no_table_inst.test
index bd6ad54325e..ec6674efb37 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_table_inst.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_table_inst.test
@@ -6,10 +6,10 @@
 --source ../include/start_server_common.inc
 
 # Expect no instances
-show variables like "performance_schema_max_table_instances";
+show global variables like "performance_schema_max_table_instances";
 
 # Expect handles
-show variables like "performance_schema_max_table_handles";
+show global variables like "performance_schema_max_table_handles";
 
 # Create an instrumented table
 --disable_warnings
@@ -22,9 +22,11 @@ select * from test.instrument_me;
 drop table test.instrument_me;
 
 # We lost all the instances
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_TABLE_INSTANCES_LOST';
+--enable_warnings
 
 # Expect no handle lost
-show status like "performance_schema_table_handles_lost";
+show global status like "performance_schema_table_handles_lost";
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_table_lock-master.opt b/mysql-test/suite/perfschema/t/start_server_no_table_lock-master.opt
new file mode 100644
index 00000000000..2fe2a5245c8
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_table_lock-master.opt
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance_schema_max_table_lock_stat=0
diff --git a/mysql-test/suite/perfschema/t/start_server_no_table_lock.test b/mysql-test/suite/perfschema/t/start_server_no_table_lock.test
new file mode 100644
index 00000000000..c80639a5799
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_table_lock.test
@@ -0,0 +1,54 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+#############################
+# Setup database and tables.
+#############################
+--disable_warnings
+drop table if exists db1.t1;
+drop database if exists db1;
+--enable_warnings
+create database db1;
+create table db1.t1 (a int, b char(10) default 'default');
+
+#######################
+# Execute few queries.
+#######################
+insert into db1.t1 values('1', 'abc');
+insert into db1.t1 values('2', 'abc');
+select * from db1.t1 where a='1';
+
+#####################################################
+# Run few queries on Performance Schema stats tables.
+#####################################################
+# There should be 3 entries in following table. 2 for insert and 1 for select.
+# This is because lock stats are still in the table handles
+select COUNT_STAR from performance_schema.table_lock_waits_summary_by_table
+       where OBJECT_SCHEMA='db1' and OBJECT_NAME='t1';
+
+# Now force aggregation by closing table handles
+FLUSH TABLES;
+
+select COUNT_STAR from performance_schema.table_lock_waits_summary_by_table
+       where OBJECT_SCHEMA='db1' and OBJECT_NAME='t1';
+
+# Expect TABLE_LOCK_STAT lost
+--disable_warnings
+select variable_value > 0 from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
+
+# While at it, check that FLUSH STATUS Resets the lost counter
+FLUSH STATUS;
+
+select variable_value from information_schema.global_status
+  where variable_name like 'PERFORMANCE_SCHEMA_TABLE_LOCK_STAT_LOST';
+--enable_warnings
+
+###########
+# Cleanup.
+###########
+drop database db1;
diff --git a/mysql-test/suite/perfschema/t/start_server_no_thread_class.test b/mysql-test/suite/perfschema/t/start_server_no_thread_class.test
index e37faeacf53..7909eb11fed 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_thread_class.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_thread_class.test
@@ -6,18 +6,20 @@
 --source ../include/start_server_common.inc
 
 # Expect no classes
-show variables like "performance_schema_max_thread_classes";
+show global variables like "performance_schema_max_thread_classes";
 
 select count(*) from performance_schema.setup_instruments
   where name like "thread/%";
 
 # We lost all the classes
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_THREAD_CLASSES_LOST';
+--enable_warnings
 
 # Expect no instances
 select count(*) from performance_schema.threads;
 
 # Expect no instances lost
-show status like "performance_schema_thread_instances_lost";
+show global status like "performance_schema_thread_instances_lost";
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_thread_inst.test b/mysql-test/suite/perfschema/t/start_server_no_thread_inst.test
index c27de1d4027..f1e221cc74e 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_thread_inst.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_thread_inst.test
@@ -6,22 +6,24 @@
 --source ../include/start_server_common.inc
 
 # Expect classes
-show variables like "performance_schema_max_thread_classes";
+show global variables like "performance_schema_max_thread_classes";
 
 # Not observable yet
 # select count(*) > 0 from performance_schema.setup_instruments
 #   where name like "thread/%";
 
 # Expect no class lost
-show status like "performance_schema_thread_classes_lost";
+show global status like "performance_schema_thread_classes_lost";
 
 # Expect no instances
-show variables like "performance_schema_max_thread_instances";
+show global variables like "performance_schema_max_thread_instances";
 
 select count(*) from performance_schema.threads;
 
 # Expect instances lost
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_THREAD_INSTANCES_LOST';
+--enable_warnings
 
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_transactions_history-master.opt b/mysql-test/suite/perfschema/t/start_server_no_transactions_history-master.opt
new file mode 100644
index 00000000000..76ffd3787bb
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_transactions_history-master.opt
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance_schema_events_transactions_history_size=0
diff --git a/mysql-test/suite/perfschema/t/start_server_no_transactions_history.test b/mysql-test/suite/perfschema/t/start_server_no_transactions_history.test
new file mode 100644
index 00000000000..266af484c7b
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_transactions_history.test
@@ -0,0 +1,14 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+# Expect no history
+show global variables like "performance_schema_events_transactions_history_size";
+select count(*) from performance_schema.events_transactions_history;
+
+# Valid operation, edge case
+truncate table performance_schema.events_transactions_history;
+
diff --git a/mysql-test/suite/perfschema/t/start_server_no_transactions_history_long-master.opt b/mysql-test/suite/perfschema/t/start_server_no_transactions_history_long-master.opt
new file mode 100644
index 00000000000..60d148e8079
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_transactions_history_long-master.opt
@@ -0,0 +1,2 @@
+--loose-enable-performance-schema
+--loose-performance_schema_events_transactions_history_long_size=0
diff --git a/mysql-test/suite/perfschema/t/start_server_no_transactions_history_long.test b/mysql-test/suite/perfschema/t/start_server_no_transactions_history_long.test
new file mode 100644
index 00000000000..83f80b528e6
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_no_transactions_history_long.test
@@ -0,0 +1,14 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--source ../include/start_server_common.inc
+
+# Expect no history long
+show global variables like "performance_schema_events_transactions_history_long_size";
+select count(*) from performance_schema.events_transactions_history_long;
+
+# Valid operation, edge case
+truncate table performance_schema.events_transactions_history_long;
+
diff --git a/mysql-test/suite/perfschema/t/start_server_no_user.test b/mysql-test/suite/perfschema/t/start_server_no_user.test
index 549b90a5851..2b1b9fed5c7 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_user.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_user.test
@@ -6,11 +6,13 @@
 --source ../include/start_server_common.inc
 
 # Expect no records
-show variables like "performance_schema_users_size";
+show global variables like "performance_schema_users_size";
 
 select count(*) from performance_schema.users;
 
 # We lost all the data
+--disable_warnings
 select variable_value > 0 from information_schema.global_status
   where variable_name like 'PERFORMANCE_SCHEMA_USERS_LOST';
+--enable_warnings
 
diff --git a/mysql-test/suite/perfschema/t/start_server_no_waits_history.test b/mysql-test/suite/perfschema/t/start_server_no_waits_history.test
index 2ee7dba2526..3eb561770b7 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_waits_history.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_waits_history.test
@@ -6,7 +6,7 @@
 --source ../include/start_server_common.inc
 
 # Expect no history
-show variables like "performance_schema_events_waits_history_size";
+show global variables like "performance_schema_events_waits_history_size";
 select count(*) from performance_schema.events_waits_history;
 
 # Valid operation, edge case
diff --git a/mysql-test/suite/perfschema/t/start_server_no_waits_history_long.test b/mysql-test/suite/perfschema/t/start_server_no_waits_history_long.test
index e393304a94d..b22b1e7ef05 100644
--- a/mysql-test/suite/perfschema/t/start_server_no_waits_history_long.test
+++ b/mysql-test/suite/perfschema/t/start_server_no_waits_history_long.test
@@ -6,7 +6,7 @@
 --source ../include/start_server_common.inc
 
 # Expect no history long
-show variables like "performance_schema_events_waits_history_long_size";
+show global variables like "performance_schema_events_waits_history_long_size";
 select count(*) from performance_schema.events_waits_history_long;
 
 # Valid operation, edge case
diff --git a/mysql-test/suite/perfschema/t/start_server_nothing-master.opt b/mysql-test/suite/perfschema/t/start_server_nothing-master.opt
index afd804c1bd0..aa7d019af5d 100644
--- a/mysql-test/suite/perfschema/t/start_server_nothing-master.opt
+++ b/mysql-test/suite/perfschema/t/start_server_nothing-master.opt
@@ -9,6 +9,7 @@
 --loose-performance_schema_max_file_classes=0
 --loose-performance_schema_max_thread_classes=0
 --loose-performance_schema_max_socket_classes=0
+--loose-performance_schema_max_memory_classes=0
 
 --loose-performance_schema_max_mutex_instances=0
 --loose-performance_schema_max_rwlock_instances=0
@@ -20,6 +21,8 @@
 --loose-performance_schema_max_table_instances=0
 --loose-performance_schema_max_file_handles=0
 --loose-performance_schema_max_table_handles=0
+--loose-performance_schema_max_index_stat=0
+--loose-performance_schema_max_table_lock_stat=0
 
 --loose-performance_schema_setup_actors_size=0
 --loose-performance_schema_setup_objects_size=0
@@ -37,3 +40,8 @@
 
 --loose-performance_schema_session_connect_attrs_size=0
 
+--loose-performance_schema_digests_size=0
+--loose-performance_schema_max_metadata_locks=0
+
+--loose-performance_schema_max_program_instances=0
+--loose-performance_schema_max_statement_stack=1
diff --git a/mysql-test/suite/perfschema/t/start_server_nothing.test b/mysql-test/suite/perfschema/t/start_server_nothing.test
index c337ef604f6..957a289473b 100644
--- a/mysql-test/suite/perfschema/t/start_server_nothing.test
+++ b/mysql-test/suite/perfschema/t/start_server_nothing.test
@@ -5,10 +5,11 @@
 
 --source ../include/start_server_common.inc
 
-show variables like "performance_schema%";
+show global variables like "performance_schema%";
 
 # Not empty
-select * from performance_schema.setup_instruments;
+select * from performance_schema.setup_instruments
+  order by name;
 select TIMER_NAME from performance_schema.performance_timers;
 select * from performance_schema.setup_consumers;
 select NAME from performance_schema.setup_timers;
@@ -44,17 +45,18 @@ select * from performance_schema.events_waits_summary_global_by_event_name;
 select * from performance_schema.file_instances;
 select * from performance_schema.file_summary_by_event_name;
 select * from performance_schema.file_summary_by_instance;
-select * from performance_schema.session_account_connect_attrs;
-select * from performance_schema.session_connect_attrs;
-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.hosts;
+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.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_objects;
+select * from performance_schema.socket_instances;
+select * from performance_schema.socket_summary_by_event_name;
+select * from performance_schema.socket_summary_by_instance;
+select * from performance_schema.table_handles;
 select * from performance_schema.threads;
 select * from performance_schema.users;
-
diff --git a/mysql-test/suite/perfschema/t/start_server_off.test b/mysql-test/suite/perfschema/t/start_server_off.test
index 400303e05d2..6fdc02acf9b 100644
--- a/mysql-test/suite/perfschema/t/start_server_off.test
+++ b/mysql-test/suite/perfschema/t/start_server_off.test
@@ -5,6 +5,9 @@
 
 --source ../include/start_server_common.inc
 
+select * from information_schema.engines
+  where engine = "PERFORMANCE_SCHEMA";
+
 # Expecting all off / zero
 show status like "performance_schema%";
 show variables like "performance_schema";
@@ -27,7 +30,7 @@ select * from performance_schema.setup_timers;
 insert into performance_schema.setup_objects values ('TABLE', 'myschema', 'myobject', 'YES', 'YES');
 
 --error ER_WRONG_PERFSCHEMA_USAGE
-insert into performance_schema.setup_actors values ('myhost', 'mysuser', 'myrole');
+insert into performance_schema.setup_actors values ('myhost', 'mysuser', 'myrole', 'YES', 'YES');
 
 # Expect SELECT, UPDATE, DELETE and TRUNCATE to affect 0 rows, but with
 # no error because the target row(s) will not be found
@@ -45,3 +48,9 @@ truncate performance_schema.events_statements_history_long;
 truncate performance_schema.events_waits_history_long;
 truncate performance_schema.setup_objects;
 truncate performance_schema.setup_actors;
+
+--disable_warnings
+# Expect that status variables are still accessible
+show global status like "performance_schema%";
+show session status like "performance_schema%";
+--enable_warnings
diff --git a/mysql-test/suite/perfschema/t/start_server_on.test b/mysql-test/suite/perfschema/t/start_server_on.test
index 18789e9d16a..dabef20efe3 100644
--- a/mysql-test/suite/perfschema/t/start_server_on.test
+++ b/mysql-test/suite/perfschema/t/start_server_on.test
@@ -7,4 +7,4 @@
 
 # Expecting nothing lost with default parameters
 
-show status like "performance_schema%";
+show global status like "performance_schema%";
diff --git a/mysql-test/suite/perfschema/t/start_server_zero_digest_sql_length-master.opt b/mysql-test/suite/perfschema/t/start_server_zero_digest_sql_length-master.opt
new file mode 100644
index 00000000000..5ee2230e539
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_zero_digest_sql_length-master.opt
@@ -0,0 +1,3 @@
+--thread_stack=655360
+--max_digest_length=0
+--loose-performance_schema_max_sql_text_length=0
diff --git a/mysql-test/suite/perfschema/t/start_server_zero_digest_sql_length.test b/mysql-test/suite/perfschema/t/start_server_zero_digest_sql_length.test
new file mode 100644
index 00000000000..4d5d5ce7859
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/start_server_zero_digest_sql_length.test
@@ -0,0 +1,20 @@
+# -----------------------------------------------------------------------
+# Tests for the performance schema statement Digests.
+# -----------------------------------------------------------------------
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+
+USE performance_schema;
+truncate table events_statements_history_long;
+
+# -----------------------------------------------------------------------
+# Test to show how the digest behaves with low value of max_digest_length
+# -----------------------------------------------------------------------
+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;
+
+--echo ####################################
+--echo # QUERYING PS STATEMENT DIGEST
+--echo ####################################
+SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long;
diff --git a/mysql-test/suite/perfschema/t/statement_digest.test b/mysql-test/suite/perfschema/t/statement_digest.test
index 59486ad61d8..724f9192955 100644
--- a/mysql-test/suite/perfschema/t/statement_digest.test
+++ b/mysql-test/suite/perfschema/t/statement_digest.test
@@ -5,6 +5,7 @@
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 
+SET sql_mode='NO_ENGINE_SUBSTITUTION';
 # Initial Setup for Digest
 --source ../include/digest_setup.inc
 
@@ -21,3 +22,4 @@ SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 
 # Cleanup for Digest
 --source ../include/digest_cleanup.inc
+SET sql_mode=default;
diff --git a/mysql-test/suite/perfschema/t/statement_digest_long_query.test b/mysql-test/suite/perfschema/t/statement_digest_long_query.test
index 7a080f7a29f..efa33800b58 100644
--- a/mysql-test/suite/perfschema/t/statement_digest_long_query.test
+++ b/mysql-test/suite/perfschema/t/statement_digest_long_query.test
@@ -4,18 +4,26 @@
 
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
+# Test requires: sp-protocol/ps-protocol/view-protocol/cursor-protocol disabled
 --source include/no_protocol.inc
+# Thread stack overrun on solaris
+let $have_solaris = `select convert(@@version_compile_os using latin1) LIKE ("solaris%")`;
+if ($have_solaris)
+{
+   skip Test requires: 'not_solaris';
+}
 
 USE performance_schema;
 truncate table events_statements_summary_by_digest;
 
 # -----------------------------------------------------------------------
 # Test to show how the digest behaves with long queries, when the token
-# stream is truncated (digest text should end with "...")
+# stream is truncated. digest text is calculated based on value of 
+# performance_schema_max_digest_length. 
 # NOTE: For this test case to run, we need to start mysql server
 # with bigger stack using "--thread_stack=#" option.
 # -----------------------------------------------------------------------
-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;
 
 --echo ####################################
 --echo # QUERYING PS STATEMENT DIGEST
diff --git a/mysql-test/suite/perfschema/t/statement_program_concurrency-master.opt b/mysql-test/suite/perfschema/t/statement_program_concurrency-master.opt
new file mode 100644
index 00000000000..8c0dedeeb17
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/statement_program_concurrency-master.opt
@@ -0,0 +1 @@
+--innodb_lock_wait_timeout=1 --thread_stack=655360
diff --git a/mysql-test/suite/perfschema/t/statement_program_concurrency.test b/mysql-test/suite/perfschema/t/statement_program_concurrency.test
new file mode 100644
index 00000000000..75261254c00
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/statement_program_concurrency.test
@@ -0,0 +1,130 @@
+#----------------------------------------------------------
+# Concurrency  check for instrumentation of stored programs 
+#----------------------------------------------------------
+
+
+--source include/big_test.inc
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history;
+
+--echo # concurrency check through multi connections
+
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+CREATE DATABASE db1;
+CREATE DATABASE db2;
+CREATE DATABASE db3;
+
+# connection 1
+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;
+
+DELIMITER |;
+CREATE PROCEDURE proc()
+BEGIN
+  INSERT INTO t1 SELECT * FROM t1;
+END|
+DELIMITER ;|
+
+--send CALL proc();
+
+# connection 2
+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;
+DELIMITER |;
+CREATE FUNCTION addition(x INT, y INT) RETURNS INT
+BEGIN
+  INSERT INTO t2 SELECT * FROM t2;
+  RETURN x+y;
+END|
+DELIMITER ;|
+
+--send SELECT addition(1234,9876);
+
+# connection 3
+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;  
+
+--send INSERT INTO t VALUES ( 20,2000);
+
+connection con1;
+--reap;
+
+connection con2;
+--reap;
+
+connection con3;
+--reap;
+
+connection default;
+--source include/wait_until_connected_again.inc
+
+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;
+
+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;
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history;
+
+--echo # 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;
+
+# Wait till all disconnects are completed
+--source include/wait_until_count_sessions.inc
diff --git a/mysql-test/suite/perfschema/t/statement_program_lost_inst-master.opt b/mysql-test/suite/perfschema/t/statement_program_lost_inst-master.opt
new file mode 100644
index 00000000000..699c91930ae
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/statement_program_lost_inst-master.opt
@@ -0,0 +1,3 @@
+--loose-performance_schema_max_program_instances=7
+--loose-performance_schema_max_statement_stack=2
+--thread_stack=655360
diff --git a/mysql-test/suite/perfschema/t/statement_program_lost_inst.test b/mysql-test/suite/perfschema/t/statement_program_lost_inst.test
new file mode 100644
index 00000000000..023180b9d2b
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/statement_program_lost_inst.test
@@ -0,0 +1,72 @@
+#-------------------------------------------------------------
+# Tests for PERFORMANCE_SCHEMA stored programs instrumentation  
+#-------------------------------------------------------------
+
+#
+#  Test case to show the behaviour of stored program instrumentation 
+#  when values of the system variables performance_schema_max_program_instances & 
+#  performance_schema_max_statement_stack are less than the statistics collected. 
+#  The status of the lost instrumentation is shown through the status variables
+#  performance_schema_program_lost & performance_schema_nested_statement_lost
+#  
+
+# Restarting the server at the begining of the test.
+# This is to avoid the instrumentation of extra SPs called by MTR 
+# These additional stored programs which will be added might cause 
+# result content mismatch failure. 
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+--exec echo "wait" > $restart_file
+--shutdown_server 
+--source include/wait_until_disconnected.inc
+--exec echo "restart:--performance_schema_max_program_instances=7 --performance_schema_max_statement_stack=2 --thread_stack=655360">$restart_file
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+--source ../include/start_server_common.inc
+
+# Values of variables server variables
+show global variables like "performance_schema_max_program_instances";
+show global variables like "performance_schema_max_statement_stack";
+
+--echo ##################### 
+--echo # Setup
+--echo ##################### 
+--source suite/perfschema/include/program_nested_setup.inc 
+
+# Truncate summary table
+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;
+# Flush status now
+Flush status;
+show global status like "%performance_schema_program_lost%";
+show global status like "%performance_schema_nested_statement_lost%";
+
+--echo ##################### 
+--echo # Executing Queries
+--echo ##################### 
+--source suite/perfschema/include/program_nested_execution.inc 
+
+--echo ###########################################
+--echo # Quering PS statement summary table      #
+--echo ########################################### 
+
+SELECT OBJECT_TYPE, OBJECT_NAME, OBJECT_SCHEMA
+       FROM performance_schema.events_statements_summary_by_program
+       WHERE OBJECT_SCHEMA='nested_sp' ORDER BY OBJECT_NAME;
+
+# Now check the lost status
+show global status like "%performance_schema_program_lost%";
+show global status like "%performance_schema_nested_statement_lost%";
+
+--echo ##################### 
+--echo # Cleanup
+--echo ##################### 
+--source suite/perfschema/include/program_nested_cleanup.inc 
+
+
diff --git a/mysql-test/suite/perfschema/t/statement_program_nested-master.opt b/mysql-test/suite/perfschema/t/statement_program_nested-master.opt
new file mode 100644
index 00000000000..3f9d7900961
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/statement_program_nested-master.opt
@@ -0,0 +1 @@
+--thread_stack=655360
diff --git a/mysql-test/suite/perfschema/t/statement_program_nested.test b/mysql-test/suite/perfschema/t/statement_program_nested.test
new file mode 100644
index 00000000000..e6649704bbf
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/statement_program_nested.test
@@ -0,0 +1,73 @@
+# -----------------------------------------------------------------------
+# Tests for the performance schema nested stored program instrumentation.
+# -----------------------------------------------------------------------
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+
+--echo #################################################
+--echo # Quering PS statement summary and history_long #
+--echo #################################################
+
+--source suite/perfschema/include/program_nested_setup.inc
+--source suite/perfschema/include/program_nested_execution.inc
+
+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;
+
+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;
+
+--echo # clean-up
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+
+# After truncate the statictics collected will are reset
+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;
+
+--source suite/perfschema/include/program_nested_cleanup.inc
+
+# After clean-up the stored programs are removed from PS tables 
+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;
+
+
+# Check the intrumentation of stored programs 
+# when statement/sp/% instruments not timed
+
+--source suite/perfschema/include/program_nested_setup.inc
+
+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;
+
+--source suite/perfschema/include/program_nested_execution.inc
+
+# check instrumentation 
+
+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/%";
+
+# clean-up
+
+# Restore the setup
+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;
+
+--source suite/perfschema/include/program_nested_cleanup.inc
diff --git a/mysql-test/suite/perfschema/t/statement_program_nesting_event_check-master.opt b/mysql-test/suite/perfschema/t/statement_program_nesting_event_check-master.opt
new file mode 100644
index 00000000000..3f9d7900961
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/statement_program_nesting_event_check-master.opt
@@ -0,0 +1 @@
+--thread_stack=655360
diff --git a/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test b/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test
new file mode 100644
index 00000000000..20c59e9a3a8
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/statement_program_nesting_event_check.test
@@ -0,0 +1,44 @@
+#-------------------------------------------------------------
+# Tests for PERFORMANCE_SCHEMA stored programs instrumentation  
+#-------------------------------------------------------------
+
+# Test to check the values populated in NESTING_EVENT_TYPE 
+# columns of events_statements_current/history/history_long PS tables. 
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+
+--echo #----------------------------
+--echo # Non-nested Stored programs.
+--echo #----------------------------
+--source suite/perfschema/include/program_setup.inc
+--source suite/perfschema/include/program_execution.inc
+
+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(*) = %' OR SQL_TEXT IS NULL)
+       ORDER BY OBJECT_NAME,NESTING_EVENT_LEVEL,SQL_TEXT;
+
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+
+# Clean-up
+--source suite/perfschema/include/program_cleanup.inc
+
+--echo #------------------------
+--echo # Nested stored programs.
+--echo #------------------------
+--source suite/perfschema/include/program_nested_setup.inc
+--source suite/perfschema/include/program_nested_execution.inc
+
+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;
+
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+
+# Clean-up
+--source suite/perfschema/include/program_nested_cleanup.inc
diff --git a/mysql-test/suite/perfschema/t/statement_program_non_nested-master.opt b/mysql-test/suite/perfschema/t/statement_program_non_nested-master.opt
new file mode 100644
index 00000000000..3f9d7900961
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/statement_program_non_nested-master.opt
@@ -0,0 +1 @@
+--thread_stack=655360
diff --git a/mysql-test/suite/perfschema/t/statement_program_non_nested.test b/mysql-test/suite/perfschema/t/statement_program_non_nested.test
new file mode 100644
index 00000000000..559bd03950e
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/statement_program_non_nested.test
@@ -0,0 +1,144 @@
+# -----------------------------------------------------------------------
+# Tests for the performance schema stored program instrumentation.
+# -----------------------------------------------------------------------
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+
+--echo ################################################
+--echo # Quering PS statement summary and history_long#
+--echo ################################################ 
+
+--source suite/perfschema/include/program_setup.inc
+--source suite/perfschema/include/program_execution.inc
+
+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;
+
+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(*) = %' OR SQL_TEXT IS NULL)
+       ORDER BY OBJECT_NAME, NESTING_EVENT_LEVEL, SQL_TEXT;
+
+
+--echo # clean -up
+
+TRUNCATE TABLE performance_schema.events_statements_summary_by_program;
+TRUNCATE TABLE performance_schema.events_statements_history_long;
+
+# After truncate the statictics collected will are reset
+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;
+
+--source suite/perfschema/include/program_cleanup.inc 
+
+# After clean-up the stored programs are removed from PS tables 
+
+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;
+
+# Check the intrumentation of stored programs 
+# when statement/sp/% instruments not timed
+
+--source suite/perfschema/include/program_setup.inc
+
+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;
+
+--source suite/perfschema/include/program_execution.inc
+
+# check instrumentation 
+
+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/%";
+
+# clean-up
+
+# Restore the setup
+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;
+
+--source suite/perfschema/include/program_cleanup.inc
+
+#----------------------------------------------------------------
+# The statistics of a stored program are not collected 
+# if its execution fails 
+#----------------------------------------------------------------
+
+--echo # set-up
+CREATE DATABASE sp;
+USE sp;
+
+CREATE TABLE t1(
+  a INT,
+  b INT
+);
+
+--echo # let the creation of the following stored programs fail 
+--error 1064
+CREATE PROCEDURE fail1(IN a INT  OUT x CHAR(16)) 
+  SET a=1;
+
+--error 1064
+CREATE FUNCTION fail2(a INT , b INT) RETURNS INT
+  x=SELECT COUNT(*) FROM t; 
+
+--error 1064
+CREATE EVENT fail3 SCHEDULE EVERY MICROSECOND DO
+  DROP TABLE t;
+
+--echo # the below query on PS table doesn't show any rows 
+--echo # 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'; 
+  
+--echo # create few stored programs 
+DELIMITER |;
+CREATE PROCEDURE p(x1 INT, x2 INT)
+BEGIN
+  INSERT INTO t1 VALUES (x1, x2);
+END|
+DELIMITER ;|
+
+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;
+
+--echo # execute the created stored programs such that they fail.
+--error 1318
+CALL p(7);
+--error 1318
+SELECT f("add",1,3);
+--error 1064
+INSERT INTO t1;
+
+--echo # the below query on PS table doesn't expose any statistics as 
+--echo # 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';
+
+--echo #clean-up
+DROP PROCEDURE p;
+DROP FUNCTION f;
+DROP TRIGGER trg;
+DROP TABLE t1;
+DROP DATABASE sp;
diff --git a/mysql-test/suite/perfschema/t/status_reprepare.test b/mysql-test/suite/perfschema/t/status_reprepare.test
new file mode 100644
index 00000000000..6393655bfa3
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/status_reprepare.test
@@ -0,0 +1,61 @@
+# Tests for PERFORMANCE_SCHEMA
+
+--source include/no_protocol.inc
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+--echo #
+--echo # ================================================================================
+--echo # SETUP
+--echo # ================================================================================
+
+# Create a new connection, to get clean statistics
+connect(con1, localhost, root,,);
+
+# Create a table
+CREATE TABLE test.t1 (c1 INT);
+
+#prepare a statement
+PREPARE stmt1 FROM "SELECT c1 FROM test.t1";
+
+#execute prepared statement;
+EXECUTE stmt1;
+
+# Check status from SHOW STATUS
+SHOW SESSION STATUS LIKE "%com_stmt_%prepare%";
+
+#check the statistics
+SELECT * FROM performance_schema.session_status WHERE VARIABLE_NAME LIKE "%com_stmt%";
+
+SELECT VARIABLE_VALUE INTO @count_global_reprepare_before
+  FROM performance_schema.global_status
+  WHERE VARIABLE_NAME LIKE "Com_stmt_reprepare";
+
+# Alter table to make server reprepare the statement
+ALTER TABLE test.t1 ADD COLUMN c2 INTEGER;
+
+#execute prepared statement;
+EXECUTE stmt1;
+
+# Check status from SHOW STATUS
+SHOW SESSION STATUS LIKE "%com_stmt_%prepare%";
+
+#check the statistics
+SELECT * FROM performance_schema.session_status WHERE VARIABLE_NAME LIKE "%com_stmt%";
+
+SELECT VARIABLE_VALUE INTO @count_global_reprepare_after
+  FROM performance_schema.global_status
+  WHERE VARIABLE_NAME LIKE "Com_stmt_reprepare";
+
+# Should increment by 1
+SELECT @count_global_reprepare_after - @count_global_reprepare_before;
+
+--echo #
+--echo # ================================================================================
+--echo # CLEANUP
+--echo # ================================================================================
+
+DROP TABLE test.t1;
+
+--disconnect con1
+--connection default
diff --git a/mysql-test/suite/perfschema/t/sxlock_func.test b/mysql-test/suite/perfschema/t/sxlock_func.test
new file mode 100644
index 00000000000..f5f38f51c78
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/sxlock_func.test
@@ -0,0 +1,75 @@
+# Performance schema tests, for SX-lock
+# Note that only Innodb provides instrumented SX-locks,
+# so this test depends largely on the innodb instrumentation.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/have_innodb.inc
+
+UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
+
+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;
+
+# Check some SX-locks classes are instrumented
+select name from performance_schema.setup_instruments
+where name like "wait/synch/sxlock/%" order by name;
+
+# Check some SX-locks instances are instrumented
+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;
+
+# Some Innodb payload, to produce data
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+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;
+
+# Make sure some shared_lock operations have been executed
+
+select operation from performance_schema.events_waits_history_long
+  where event_name like "wait/synch/sxlock/%"
+  and operation = "shared_lock" limit 1;
+
+# Make sure some exclusive_lock operations have been executed
+
+select operation from performance_schema.events_waits_history_long
+  where event_name like "wait/synch/sxlock/%"
+  and operation = "exclusive_lock" limit 1;
+
+# The following operations are not verified in this test:
+# - shared_exclusive_lock
+# - try_shared_lock
+# - try_shared_exclusive_lock
+# - try_exclusive_lock
+# because to observe them:
+# - there must be an actual code path using the operation
+#   (this affects try operations, which are not all used)
+# - there must be a repeatable scenario to trigger the
+#   code path, to use as payload in the test script
+
+# Cleanup
+
+
+UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
+
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test
index c64838b206b..9205e2b9232 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_2t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test
index 7a0676c6006..60db987b9df 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_2u_3t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test
index fb9f896eeca..1bac2d52014 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_2t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test
index eb9b7b4faa8..4909defee60 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_global_4u_3t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test
index 5d1f36228e8..7721599ba5d 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_2t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test
index b1e4043f12f..ef1e196a151 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_2u_3t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # hist by default
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test
index 53992612fc2..ad34cd9f44f 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_2t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test
index 05306d74d8b..078a6d9e245 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_hist_4u_3t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test
index 4376b49eb3c..a155619e9aa 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_2t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test
index d1412b148da..c48d39f5eb7 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test
index 46ab5ce3b01..ff69d164f64 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test
index 9ee66735961..3ee77d05700 100644
--- a/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test
+++ b/mysql-test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test
@@ -1,5 +1,8 @@
 # Tests for the performance schema
 
+# Use MyISAM as InnoDB SE no longer uses THR_LOCK locks.
+#--source include/force_myisam_default.inc
+
 --source ../include/table_aggregate_setup.inc
 
 # table lock
diff --git a/mysql-test/suite/perfschema/t/table_name.test b/mysql-test/suite/perfschema/t/table_name.test
index 5fb8ccd0f7f..aca713c3987 100644
--- a/mysql-test/suite/perfschema/t/table_name.test
+++ b/mysql-test/suite/perfschema/t/table_name.test
@@ -17,7 +17,7 @@
 --source include/have_innodb.inc
 --source include/not_embedded.inc
 
---echo
+--echo #
 --echo #
 --echo # TEST 1: Normal tables prefixed with "#sql" and "sql".
 --echo #
@@ -25,120 +25,129 @@ USE test;
 CREATE TABLE `#sql_1` (a int, b text);
 # INSERT forces path through get_table_share()
 INSERT INTO `#sql_1` VALUES(1,'one');
---echo
+--echo #
 CREATE TABLE `sql_1` (a int, b text);
 INSERT INTO `sql_1` VALUES(1,'one');
---echo
+--echo #
 --echo # Verify that the tables are treated as normal tables .
---echo
+--echo #
 --sorted_result
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
---echo
+WHERE object_schema="test"
+ORDER BY object_name;
+--echo #
 --echo # Drop the tables, verify that the table objects are removed.
---echo
+--echo #
 DROP TABLE `#sql_1`;
 DROP TABLE `sql_1`;
---echo
+--echo #
 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;
 
---echo
+--echo #
 --echo #
 --echo # TEST 2: Temporary tables, no special prefix.
 --echo #
 CREATE TEMPORARY TABLE sql_temp2_myisam (a int, b text) ENGINE=MYISAM;
 INSERT INTO sql_temp2_myisam VALUES(1,'one');
---echo
+--echo #
 CREATE TEMPORARY TABLE sql_temp2_innodb (a int, b text) ENGINE=INNODB;
 INSERT INTO sql_temp2_innodb VALUES(1,'one');
---echo
+--echo #
 --echo # Confirm that the temporary tables are ignored.
---echo
+--echo #
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
---echo
+WHERE object_schema="test"
+ORDER BY object_name;
+--echo #
 --echo # Drop the tables, verify that the table objects are not created.
---echo
+--echo #
 DROP TABLE sql_temp2_myisam;
 DROP TABLE sql_temp2_innodb;
---echo
+--echo #
 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;
 
---echo
+--echo #
 --echo #
 --echo # TEST 3: Temporary tables with the "#sql" prefix.
 --echo #
 CREATE TEMPORARY TABLE `#sql_temp3_myisam` (a int, b text) ENGINE=MYISAM;
 CHECK TABLE `#sql_temp3_myisam`;
 INSERT INTO `#sql_temp3_myisam` VALUES(1,'one');
---echo
+--echo #
 CREATE TEMPORARY TABLE `#sql_temp3_innodb` (a int, b text) ENGINE=INNODB;
 CHECK TABLE `#sql_temp3_innodb`;
 INSERT INTO `#sql_temp3_innodb` VALUES(1,'one');
---echo
+--echo #
 --echo # Confirm that the temporary tables are ignored.
---echo
+--echo #
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
---echo
+WHERE object_schema="test"
+ORDER BY object_name;
+--echo #
 --echo # Drop the temporary tables.
---echo
+--echo #
 DROP TABLE `#sql_temp3_myisam`;
 DROP TABLE `#sql_temp3_innodb`;
---echo
+--echo #
 --echo # Confirm that the temporary tables are still ignored.
---echo
+--echo #
 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;
 
---echo
+--echo #
 --echo #
 --echo # TEST 4: Special case: MyISAM temporary tables are recreated as non-temporary
 --echo #         when they are truncated.
 --echo #
 CREATE TEMPORARY TABLE `sql_temp4_myisam` (a int, b text) ENGINE=MYISAM;
 INSERT INTO `sql_temp4_myisam` VALUES(1,'one');
---echo
+--echo #
 CREATE TEMPORARY TABLE `#sql_temp4_myisam` (a int, b text) ENGINE=MYISAM;
 INSERT INTO `#sql_temp4_myisam` VALUES(1,'one');
---echo
+--echo #
 --echo # Confirm that the MyISAM temporary tables are ignored.
---echo
+--echo #
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
---echo
+WHERE object_schema="test"
+ORDER BY object_name;
+--echo #
 --echo # Truncate the MyISAM temporary tables, forcing them to be recreated as non-temporary.
---echo
+--echo #
 TRUNCATE TABLE `sql_temp4_myisam`;
 TRUNCATE TABLE `#sql_temp4_myisam`;
---echo
+--echo #
 --echo # Confirm that the recreated MyISAM tables are still regarded as temporary and ignored.
---echo
+--echo #
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
---echo
+WHERE object_schema="test"
+ORDER BY object_name;
+--echo #
 --echo # Drop the recreated MyISAM tables;
---echo
+--echo #
 DROP TABLE `sql_temp4_myisam`;
 DROP TABLE `#sql_temp4_myisam`;
---echo
+--echo #
 --echo # Confirm that the recreated temporary tables are still ignored.
---echo
+--echo #
 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;
 
---echo
+--echo #
 --echo #
 --echo # TEST 5: Generate temporary tables with ALTER MyISAM table.
 --echo #
@@ -147,20 +156,22 @@ CREATE TABLE t1 (a int) ENGINE=MYISAM;
 INSERT INTO t1 VALUES (1), (2), (3);
 # Force a path throug mysql_alter_table() and ha_create_table().
 ALTER TABLE t1 ADD COLUMN (b int);
---echo
+--echo #
 --echo # Confirm that the recreated temporary tables are still ignored.
---echo
+--echo #
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
-WHERE object_schema="test";
---echo
+WHERE object_schema="test"
+ORDER BY object_name;
+--echo #
 --echo # Drop the MyISAM table
---echo
+--echo #
 DROP TABLE t1;
 
---echo
+--echo #
 --echo # Confirm that no tables remain;
---echo
+--echo #
 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;
diff --git a/mysql-test/suite/perfschema/t/table_schema.test b/mysql-test/suite/perfschema/t/table_schema.test
index d141420b209..935bd667f2d 100644
--- a/mysql-test/suite/perfschema/t/table_schema.test
+++ b/mysql-test/suite/perfschema/t/table_schema.test
@@ -16,9 +16,9 @@ select * from information_schema.columns where table_schema="performance_schema"
 
 # Count the number of NUMBER_OF_BYTES columns.
 
-select count(*) from information_schema.columns
+select count(*) into @count_byte_columns from information_schema.columns
    where table_schema="performance_schema" and data_type = "bigint"
-   and column_name like "%number_of_bytes" into @count_byte_columns;
+   and column_name like "%number_of_bytes";
 
 # Confirm that at least one column was found.
 
@@ -26,10 +26,10 @@ select @count_byte_columns > 0;
 
 # Confirm that all NUMBER_OF_BYTES columns are BIGINT signed.
 
-select count(*) from information_schema.columns
+select count(*) into @count_byte_signed from information_schema.columns
    where table_schema="performance_schema" and data_type="bigint"
    and column_name like "%number_of_bytes"
-   and column_type not like "%unsigned" into @count_byte_signed;
+   and column_type not like "%unsigned";
 
 select (@count_byte_columns - @count_byte_signed) = 0;
 
@@ -38,9 +38,9 @@ select (@count_byte_columns - @count_byte_signed) = 0;
 #
 # Count the number of OBJECT_INSTANCE_BEGIN columns.
 
-select count(*) from information_schema.columns
+select count(*) into @count_object_columns from information_schema.columns
    where table_schema="performance_schema" and data_type = "bigint"
-   and column_name like "%object_instance_begin" into @count_object_columns;
+   and column_name like "%object_instance_begin";
 
 # Confirm that at least one column was found.
 
@@ -48,10 +48,10 @@ select @count_object_columns > 0;
 
 # Confirm that all OBJECT_INSTANCE_BEGIN columns are BIGINT unsigned.
 
-select count(*) from information_schema.columns
+select count(*) into @count_object_unsigned from information_schema.columns
    where table_schema="performance_schema" and data_type="bigint"
    and column_name like "%object_instance_begin"
-   and column_type like "%unsigned" into @count_object_unsigned;
+   and column_type like "%unsigned";
 
 select (@count_object_columns - @count_object_unsigned) = 0;
 
diff --git a/mysql-test/suite/perfschema/t/thread_cache.test b/mysql-test/suite/perfschema/t/thread_cache.test
index 4ebadfde9fb..92309bb9ca1 100644
--- a/mysql-test/suite/perfschema/t/thread_cache.test
+++ b/mysql-test/suite/perfschema/t/thread_cache.test
@@ -17,7 +17,7 @@ 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";
 
 connect (con1, localhost, root, , );
 
@@ -91,7 +91,7 @@ select @thread_id_increment;
 
 set global thread_cache_size = 100;
 
-show variables like "thread_cache_size";
+show global variables like "thread_cache_size";
 
 connect (con1, localhost, root, , );
 
@@ -169,5 +169,5 @@ select @thread_id_increment;
 
 set global thread_cache_size = @saved_thread_cache_size;
 
-show status like "performance_schema_thread%";
+show global status like "performance_schema_thread%";
 
diff --git a/mysql-test/suite/perfschema/t/thread_misc-master.opt b/mysql-test/suite/perfschema/t/thread_misc-master.opt
new file mode 100644
index 00000000000..34586f1fed5
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/thread_misc-master.opt
@@ -0,0 +1 @@
+--loose-performance-schema-consumer-thread-instrumentation=0
diff --git a/mysql-test/suite/perfschema/t/thread_misc.test b/mysql-test/suite/perfschema/t/thread_misc.test
new file mode 100644
index 00000000000..4f5fa4f0ac1
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/thread_misc.test
@@ -0,0 +1,11 @@
+
+# Bug#22118669 - ASSERTION `PFS_FILE != __NULL' FAILED
+ 
+# Cause a temporary file to be instrumented,
+# while there are no per thread statistics collected.
+
+--disable_result_log
+select * from information_schema.columns ORDER BY table_name;
+--enable_result_log
+
+
diff --git a/mysql-test/suite/perfschema/t/threads_history.test b/mysql-test/suite/perfschema/t/threads_history.test
new file mode 100644
index 00000000000..f42dd6d0ab4
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/threads_history.test
@@ -0,0 +1,727 @@
+# Check the impact of changes done in HISTORY column in
+# performance_schema.setup_actors.
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+--source include/no_protocol.inc
+
+# Presence of the query cache changes query stages,
+# causing noise in the test output
+#--source include/have_query_cache_disabled.inc
+
+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;
+
+--echo # Switch to (con1, localhost, user1, , )
+connect (con1, localhost, user1, , );
+
+update performance_schema.threads
+  set INSTRUMENTED='YES', HISTORY='YES'
+  where PROCESSLIST_ID = connection_id();
+
+let $con1_thread_id= `select THREAD_ID from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--echo # Switch to (con2, localhost, user2, , )
+connect (con2, localhost, user2, , );
+
+update performance_schema.threads
+  set INSTRUMENTED='YES', HISTORY='NO'
+  where PROCESSLIST_ID = connection_id();
+
+let $con2_thread_id= `select THREAD_ID from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--echo # Switch to (con3, localhost, user3, , )
+connect (con3, localhost, user3, , );
+
+update performance_schema.threads
+  set INSTRUMENTED='NO', HISTORY='YES'
+  where PROCESSLIST_ID = connection_id();
+
+let $con3_thread_id= `select THREAD_ID from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--echo # Switch to (con4, localhost, user4, , )
+connect (con4, localhost, user4, , );
+
+update performance_schema.threads
+  set INSTRUMENTED='NO', HISTORY='NO'
+  where PROCESSLIST_ID = connection_id();
+
+let $con4_thread_id= `select THREAD_ID from performance_schema.threads
+  where PROCESSLIST_ID = connection_id()`;
+
+--echo # 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;
+
+--echo # Switch to connection con1
+--connection con1
+
+XA START 'XA_CON1', 'XA_BQUAL', 12;
+select "Hi from con1";
+XA END 'XA_CON1', 'XA_BQUAL', 12;
+XA PREPARE 'XA_CON1', 'XA_BQUAL', 12;
+XA COMMIT 'XA_CON1', 'XA_BQUAL', 12;
+
+--echo # Switch to connection con2
+--connection con2
+
+XA START 'XA_CON2', 'XA_BQUAL', 12;
+select "Hi from con2";
+XA END 'XA_CON2', 'XA_BQUAL', 12;
+XA PREPARE 'XA_CON2', 'XA_BQUAL', 12;
+XA COMMIT 'XA_CON2', 'XA_BQUAL', 12;
+
+--echo # Switch to connection con3
+--connection con3
+
+XA START 'XA_CON3', 'XA_BQUAL', 12;
+select "Hi from con3";
+XA END 'XA_CON3', 'XA_BQUAL', 12;
+XA PREPARE 'XA_CON3', 'XA_BQUAL', 12;
+XA COMMIT 'XA_CON3', 'XA_BQUAL', 12;
+
+--echo # Switch to connection con4
+--connection con4
+
+XA START 'XA_CON4', 'XA_BQUAL', 12;
+select "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
+
+--disable_query_log
+
+echo "=========================== Transactions user 1";
+
+eval select XID_FORMAT_ID, XID_GTRID, XID_BQUAL from performance_schema.events_transactions_current
+  where THREAD_ID = $con1_thread_id;
+eval select XID_FORMAT_ID, XID_GTRID, XID_BQUAL from performance_schema.events_transactions_history
+  where THREAD_ID = $con1_thread_id;
+eval select XID_FORMAT_ID, XID_GTRID, XID_BQUAL from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con1_thread_id;
+
+echo "=========================== Transactions user 2";
+
+eval select XID_FORMAT_ID, XID_GTRID, XID_BQUAL from performance_schema.events_transactions_current
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_transactions_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Transactions user 3";
+
+eval select count(*) from performance_schema.events_transactions_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_transactions_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Transactions user 4";
+
+eval select count(*) from performance_schema.events_transactions_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_transactions_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con4_thread_id;
+
+echo "=========================== Statements user 1";
+
+eval select EVENT_NAME, SQL_TEXT from performance_schema.events_statements_current
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select EVENT_NAME, SQL_TEXT from performance_schema.events_statements_history
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select EVENT_NAME, SQL_TEXT from performance_schema.events_statements_history_long
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+
+echo "=========================== Statements user 2";
+
+eval select EVENT_NAME, SQL_TEXT from performance_schema.events_statements_current
+  where THREAD_ID = $con2_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_statements_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_statements_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Statements user 3";
+
+eval select count(*) from performance_schema.events_statements_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_statements_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_statements_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Statements user 4";
+
+eval select count(*) from performance_schema.events_statements_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_statements_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_statements_history_long
+  where THREAD_ID = $con4_thread_id;
+
+echo "=========================== Stages user 1";
+
+eval select EVENT_NAME from performance_schema.events_stages_current
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select EVENT_NAME from performance_schema.events_stages_history
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select EVENT_NAME from performance_schema.events_stages_history_long
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+
+echo "=========================== Stages user 2";
+
+eval select EVENT_NAME from performance_schema.events_stages_current
+  where THREAD_ID = $con2_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_stages_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_stages_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Stages user 3";
+
+eval select count(*) from performance_schema.events_stages_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_stages_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_stages_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Stages user 4";
+
+eval select count(*) from performance_schema.events_stages_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_stages_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_stages_history_long
+  where THREAD_ID = $con4_thread_id;
+
+echo "=========================== Waits user 1";
+
+eval select EVENT_NAME from performance_schema.events_waits_current
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select (count(*) > 5) as has_waits from performance_schema.events_waits_history
+  where THREAD_ID = $con1_thread_id;
+eval select (count(*) > 15) as has_waits from performance_schema.events_waits_history_long
+  where THREAD_ID = $con1_thread_id;
+
+echo "=========================== Waits user 2";
+
+eval select EVENT_NAME from performance_schema.events_waits_current
+  where THREAD_ID = $con2_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_waits_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_waits_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Waits user 3";
+
+eval select count(*) from performance_schema.events_waits_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_waits_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_waits_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Waits user 4";
+
+eval select count(*) from performance_schema.events_waits_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_waits_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_waits_history_long
+  where THREAD_ID = $con4_thread_id;
+
+--enable_query_log
+
+--echo # 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;
+
+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;
+
+--echo # Switch to connection con1
+--connection con1
+
+XA START 'XA_CON1', 'XA_BQUAL', 12;
+select "Hi from con1";
+XA END 'XA_CON1', 'XA_BQUAL', 12;
+XA PREPARE 'XA_CON1', 'XA_BQUAL', 12;
+XA COMMIT 'XA_CON1', 'XA_BQUAL', 12;
+
+--echo # Switch to connection con2
+--connection con2
+
+XA START 'XA_CON2', 'XA_BQUAL', 12;
+select "Hi from con2";
+XA END 'XA_CON2', 'XA_BQUAL', 12;
+XA PREPARE 'XA_CON2', 'XA_BQUAL', 12;
+XA COMMIT 'XA_CON2', 'XA_BQUAL', 12;
+
+--echo # Switch to connection con3
+--connection con3
+
+XA START 'XA_CON3', 'XA_BQUAL', 12;
+select "Hi from con3";
+XA END 'XA_CON3', 'XA_BQUAL', 12;
+XA PREPARE 'XA_CON3', 'XA_BQUAL', 12;
+XA COMMIT 'XA_CON3', 'XA_BQUAL', 12;
+
+--echo # Switch to connection con4
+--connection con4
+
+XA START 'XA_CON4', 'XA_BQUAL', 12;
+select "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
+
+--disable_query_log
+
+echo "=========================== Transactions user 1";
+
+eval select XID_FORMAT_ID, XID_GTRID, XID_BQUAL from performance_schema.events_transactions_current
+  where THREAD_ID = $con1_thread_id;
+eval select count(*) from performance_schema.events_transactions_history
+  where THREAD_ID = $con1_thread_id;
+eval select count(*) from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con1_thread_id;
+
+echo "=========================== Transactions user 2";
+
+eval select XID_FORMAT_ID, XID_GTRID, XID_BQUAL from performance_schema.events_transactions_current
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_transactions_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Transactions user 3";
+
+eval select count(*) from performance_schema.events_transactions_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_transactions_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Transactions user 4";
+
+eval select count(*) from performance_schema.events_transactions_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_transactions_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con4_thread_id;
+
+echo "=========================== Statements user 1";
+
+eval select EVENT_NAME, SQL_TEXT from performance_schema.events_statements_current
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_statements_history
+  where THREAD_ID = $con1_thread_id;
+eval select count(*) from performance_schema.events_statements_history_long
+  where THREAD_ID = $con1_thread_id;
+
+echo "=========================== Statements user 2";
+
+eval select EVENT_NAME, SQL_TEXT from performance_schema.events_statements_current
+  where THREAD_ID = $con2_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_statements_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_statements_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Statements user 3";
+
+eval select count(*) from performance_schema.events_statements_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_statements_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_statements_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Statements user 4";
+
+eval select count(*) from performance_schema.events_statements_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_statements_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_statements_history_long
+  where THREAD_ID = $con4_thread_id;
+
+echo "=========================== Stages user 1";
+
+eval select EVENT_NAME from performance_schema.events_stages_current
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_stages_history
+  where THREAD_ID = $con1_thread_id;
+eval select count(*) from performance_schema.events_stages_history_long
+  where THREAD_ID = $con1_thread_id;
+
+echo "=========================== Stages user 2";
+
+eval select EVENT_NAME from performance_schema.events_stages_current
+  where THREAD_ID = $con2_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_stages_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_stages_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Stages user 3";
+
+eval select count(*) from performance_schema.events_stages_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_stages_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_stages_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Stages user 4";
+
+eval select count(*) from performance_schema.events_stages_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_stages_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_stages_history_long
+  where THREAD_ID = $con4_thread_id;
+
+echo "=========================== Waits user 1";
+
+eval select EVENT_NAME from performance_schema.events_waits_current
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) as has_waits from performance_schema.events_waits_history
+  where THREAD_ID = $con1_thread_id;
+eval select count(*) as has_waits from performance_schema.events_waits_history_long
+  where THREAD_ID = $con1_thread_id;
+
+echo "=========================== Waits user 2";
+
+eval select EVENT_NAME from performance_schema.events_waits_current
+  where THREAD_ID = $con2_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_waits_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_waits_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Waits user 3";
+
+eval select count(*) from performance_schema.events_waits_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_waits_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_waits_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Waits user 4";
+
+eval select count(*) from performance_schema.events_waits_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_waits_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_waits_history_long
+  where THREAD_ID = $con4_thread_id;
+
+--enable_query_log
+
+--echo # 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;
+
+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;
+
+--echo # Switch to connection con1
+--connection con1
+
+XA START 'XA_CON1', 'XA_BQUAL', 12;
+select "Hi from con1";
+XA END 'XA_CON1', 'XA_BQUAL', 12;
+XA PREPARE 'XA_CON1', 'XA_BQUAL', 12;
+XA COMMIT 'XA_CON1', 'XA_BQUAL', 12;
+
+--echo # Switch to connection con2
+--connection con2
+
+XA START 'XA_CON2', 'XA_BQUAL', 12;
+select "Hi from con2";
+XA END 'XA_CON2', 'XA_BQUAL', 12;
+XA PREPARE 'XA_CON2', 'XA_BQUAL', 12;
+XA COMMIT 'XA_CON2', 'XA_BQUAL', 12;
+
+--echo # Switch to connection con3
+--connection con3
+
+XA START 'XA_CON3', 'XA_BQUAL', 12;
+select "Hi from con3";
+XA END 'XA_CON3', 'XA_BQUAL', 12;
+XA PREPARE 'XA_CON3', 'XA_BQUAL', 12;
+XA COMMIT 'XA_CON3', 'XA_BQUAL', 12;
+
+--echo # Switch to connection con4
+--connection con4
+
+XA START 'XA_CON4', 'XA_BQUAL', 12;
+select "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
+
+--disable_query_log
+
+echo "=========================== Transactions user 1";
+
+eval select XID_FORMAT_ID, XID_GTRID, XID_BQUAL from performance_schema.events_transactions_current
+  where THREAD_ID = $con1_thread_id;
+eval select XID_FORMAT_ID, XID_GTRID, XID_BQUAL from performance_schema.events_transactions_history
+  where THREAD_ID = $con1_thread_id;
+eval select XID_FORMAT_ID, XID_GTRID, XID_BQUAL from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con1_thread_id;
+
+echo "=========================== Transactions user 2";
+
+eval select XID_FORMAT_ID, XID_GTRID, XID_BQUAL from performance_schema.events_transactions_current
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_transactions_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Transactions user 3";
+
+eval select count(*) from performance_schema.events_transactions_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_transactions_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Transactions user 4";
+
+eval select count(*) from performance_schema.events_transactions_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_transactions_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_transactions_history_long
+  where THREAD_ID = $con4_thread_id;
+
+echo "=========================== Statements user 1";
+
+eval select EVENT_NAME, SQL_TEXT from performance_schema.events_statements_current
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select EVENT_NAME, SQL_TEXT from performance_schema.events_statements_history
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select EVENT_NAME, SQL_TEXT from performance_schema.events_statements_history_long
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+
+echo "=========================== Statements user 2";
+
+eval select EVENT_NAME, SQL_TEXT from performance_schema.events_statements_current
+  where THREAD_ID = $con2_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_statements_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_statements_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Statements user 3";
+
+eval select count(*) from performance_schema.events_statements_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_statements_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_statements_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Statements user 4";
+
+eval select count(*) from performance_schema.events_statements_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_statements_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_statements_history_long
+  where THREAD_ID = $con4_thread_id;
+
+echo "=========================== Stages user 1";
+
+eval select EVENT_NAME from performance_schema.events_stages_current
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select EVENT_NAME from performance_schema.events_stages_history
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select EVENT_NAME from performance_schema.events_stages_history_long
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+
+echo "=========================== Stages user 2";
+
+eval select EVENT_NAME from performance_schema.events_stages_current
+  where THREAD_ID = $con2_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_stages_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_stages_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Stages user 3";
+
+eval select count(*) from performance_schema.events_stages_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_stages_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_stages_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Stages user 4";
+
+eval select count(*) from performance_schema.events_stages_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_stages_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_stages_history_long
+  where THREAD_ID = $con4_thread_id;
+
+echo "=========================== Waits user 1";
+
+eval select EVENT_NAME from performance_schema.events_waits_current
+  where THREAD_ID = $con1_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select (count(*) > 5) as has_waits from performance_schema.events_waits_history
+  where THREAD_ID = $con1_thread_id;
+eval select (count(*) > 15) as has_waits from performance_schema.events_waits_history_long
+  where THREAD_ID = $con1_thread_id;
+
+echo "=========================== Waits user 2";
+
+eval select EVENT_NAME from performance_schema.events_waits_current
+  where THREAD_ID = $con2_thread_id
+  order by THREAD_ID, EVENT_ID;
+eval select count(*) from performance_schema.events_waits_history
+  where THREAD_ID = $con2_thread_id;
+eval select count(*) from performance_schema.events_waits_history_long
+  where THREAD_ID = $con2_thread_id;
+
+echo "=========================== Waits user 3";
+
+eval select count(*) from performance_schema.events_waits_current
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_waits_history
+  where THREAD_ID = $con3_thread_id;
+eval select count(*) from performance_schema.events_waits_history_long
+  where THREAD_ID = $con3_thread_id;
+
+echo "=========================== Waits user 4";
+
+eval select count(*) from performance_schema.events_waits_current
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_waits_history
+  where THREAD_ID = $con4_thread_id;
+eval select count(*) from performance_schema.events_waits_history_long
+  where THREAD_ID = $con4_thread_id;
+
+--enable_query_log
+
+--echo # 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;
+
diff --git a/mysql-test/suite/perfschema/t/threads_innodb.test b/mysql-test/suite/perfschema/t/threads_innodb.test
index 66bceab724a..366c3b82ce8 100644
--- a/mysql-test/suite/perfschema/t/threads_innodb.test
+++ b/mysql-test/suite/perfschema/t/threads_innodb.test
@@ -7,6 +7,8 @@
 --source include/have_innodb.inc
 --source include/have_perfschema.inc
 
+#--source include/turn_off_only_full_group_by.inc
+
 # There are several InnoDB io_handler_threads servicing for read IO, write IO etc.
 # The number of these threads is at least for some types configurable.
 # We suppress here duplicates rows with the goal to avoid that the test fails
@@ -18,3 +20,4 @@ FROM performance_schema.threads
 WHERE name LIKE 'thread/innodb/%'
 GROUP BY name;
 
+#--source include/restore_sql_mode_after_turn_off_only_full_group_by.inc
diff --git a/mysql-test/suite/perfschema/t/threads_insert_delayed.test b/mysql-test/suite/perfschema/t/threads_insert_delayed.test
deleted file mode 100644
index a9f3edc6cfe..00000000000
--- a/mysql-test/suite/perfschema/t/threads_insert_delayed.test
+++ /dev/null
@@ -1,40 +0,0 @@
-
-# Tests for special content of performance_schema.threads
-#
-# The feature INSERT DELAYED (supported by MyISAM,MEMORY,ARCHIVE,BLACKHOLE)
-#    causes that a "delayed_insert" thread shows up as soon as the first
-#    INSERT DELAYED was issued.
-
---source include/not_embedded.inc
---source include/have_perfschema.inc
-
---disable_warnings
-DROP TABLE IF EXISTS t1;
-DROP TEMPORARY TABLE IF EXISTS t2;
---enable_warnings
-CREATE TABLE t1 (f1 BIGINT) ENGINE = MyISAM;
-CREATE TEMPORARY TABLE t2 AS
-SELECT thread_id FROM performance_schema.threads WHERE 1 = 2;
-
-# Reveal that the delayed_insert thread does not exist.
-# Note(mleich): This expectation is probably not all time true.
-SELECT COUNT(*) = 0 AS expect_1 FROM performance_schema.threads
-WHERE name = 'thread/sql/delayed_insert';
-
-INSERT INTO t2 SELECT thread_id
-FROM performance_schema.threads;
-
-let $wait_condition= SELECT COUNT(*) = 1 AS expect_0 FROM performance_schema.threads
-WHERE name = 'thread/sql/delayed_insert';
-INSERT DELAYED INTO t1 SET f1 = SLEEP(3);
---source include/wait_condition.inc
-
-# Expect to get
-# thread/sql/delayed_insert	FOREGROUND	YES	root	localhost
-SELECT name, type, instrumented, processlist_user, processlist_host
-FROM performance_schema.threads
-WHERE thread_id NOT IN (SELECT thread_id FROM t2);
-
-DROP TABLE t1;
-DROP TEMPORARY TABLE t2;
-
diff --git a/mysql-test/suite/perfschema/t/threads_mysql_freebsd.test b/mysql-test/suite/perfschema/t/threads_mysql_freebsd.test
new file mode 100644
index 00000000000..a075263629e
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/threads_mysql_freebsd.test
@@ -0,0 +1,22 @@
+
+# Tests for special content of performance_schema.threads
+#
+# Show MySQL server related content in performance_schema.threads
+
+--source include/freebsd.inc
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+# Every thread should be bound to an operating system thread
+# (this test is not using the thread_pool)
+
+# Note that this test will fail:
+# - on platforms where my_thread_os_id() is not supported,
+#   which is not the case on FreeBSD
+# - if some code in the server does not assign a THREAD_OS_ID
+#   to an instrumented thread, in which case this is a bug
+#   in the component instrumentation.
+
+SELECT THREAD_ID, NAME, THREAD_OS_ID from performance_schema.threads
+  WHERE THREAD_OS_ID is NULL;
+
diff --git a/mysql-test/suite/perfschema/t/threads_mysql_linux.test b/mysql-test/suite/perfschema/t/threads_mysql_linux.test
new file mode 100644
index 00000000000..d56fe73d0c9
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/threads_mysql_linux.test
@@ -0,0 +1,22 @@
+
+# Tests for special content of performance_schema.threads
+#
+# Show MySQL server related content in performance_schema.threads
+
+--source include/linux.inc
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+# Every thread should be bound to an operating system thread
+# (this test is not using the thread_pool)
+
+# Note that this test will fail:
+# - on platforms where my_thread_os_id() is not supported,
+#   which is not the case on linux
+# - if some code in the server does not assign a THREAD_OS_ID
+#   to an instrumented thread, in which case this is a bug
+#   in the component instrumentation.
+
+SELECT THREAD_ID, NAME, THREAD_OS_ID from performance_schema.threads
+  WHERE THREAD_OS_ID is NULL;
+
diff --git a/mysql-test/suite/perfschema/t/threads_mysql_windows.test b/mysql-test/suite/perfschema/t/threads_mysql_windows.test
new file mode 100644
index 00000000000..f7c1145fa5e
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/threads_mysql_windows.test
@@ -0,0 +1,22 @@
+
+# Tests for special content of performance_schema.threads
+#
+# Show MySQL server related content in performance_schema.threads
+
+--source include/windows.inc
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+# Every thread should be bound to an operating system thread
+# (this test is not using the thread_pool)
+
+# Note that this test will fail:
+# - on platforms where my_thread_os_id() is not supported,
+#   which is not the case on windows
+# - if some code in the server does not assign a THREAD_OS_ID
+#   to an instrumented thread, in which case this is a bug
+#   in the component instrumentation.
+
+SELECT THREAD_ID, NAME, THREAD_OS_ID from performance_schema.threads
+  WHERE THREAD_OS_ID is NULL;
+
diff --git a/mysql-test/suite/perfschema/t/transaction-master.opt b/mysql-test/suite/perfschema/t/transaction-master.opt
new file mode 100644
index 00000000000..c720b9a1edb
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/transaction-master.opt
@@ -0,0 +1,4 @@
+--loose-gtid-mode=on
+--loose-enforce-gtid-consistency
+--log-bin
+--log-slave-updates
diff --git a/mysql-test/suite/perfschema/t/transaction.test b/mysql-test/suite/perfschema/t/transaction.test
new file mode 100644
index 00000000000..b616460374e
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/transaction.test
@@ -0,0 +1,734 @@
+############# suite/perfschema/t/transaction.test ####################
+#                                                                    #
+# Test processing of transaction events by the Performance Schema,   #
+# including explicit/implicit transactions, access modes, isolation  #
+# levels, statement counts and state transitions.                    #
+#                                                                    #
+#                                                                    #
+######################################################################
+
+--source include/have_perfschema.inc
+--source include/not_embedded.inc
+--source include/have_innodb.inc
+--source include/no_protocol.inc
+--disable_query_log
+--source ../include/transaction_setup.inc
+--enable_query_log
+set global binlog_format=ROW;
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 1 - SETUP
+--echo # ========================================================================
+
+--echo #
+--echo # Control thread
+--echo #
+--connection default
+SET SESSION AUTOCOMMIT= 1;
+eval $get_thread_id;
+let $default_thread_id= `SELECT @my_thread_id`;
+
+--echo #
+--echo # Connection 1
+--echo #
+connect(con1, localhost, root,,);
+--disable_query_log
+eval $get_thread_id;
+let $con1_thread_id= `SELECT @my_thread_id`;
+--enable_query_log
+SET SESSION AUTOCOMMIT= 0;
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ, READ WRITE;
+
+--disable_parsing
+--echo #
+--echo # Connection 2
+--echo #
+connect(con2, localhost, root,,);
+--disable_query_log
+eval $get_thread_id;
+let $con2_thread_id= `SELECT @my_thread_id`;
+--enable_query_log
+SET SESSION AUTOCOMMIT= 0;
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ, READ WRITE;
+--enable_parsing
+
+--connection default
+--disable_query_log
+eval SET @con1_thread_id= $con1_thread_id;
+#eval SET @con2_thread_id= $con2_thread_id;
+--enable_query_log
+
+--echo #
+--echo # Create test tables, one transactional and one non-transactional
+--echo #
+--connection default
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS nt1;
+--enable_warnings
+CREATE TABLE t1 (s1 int, s2 varchar(64)) ENGINE=INNODB;
+CREATE TABLE nt1 (s1 int, s2 varchar(64)) ENGINE=MYISAM;
+
+--echo #
+--echo # Disable all events from the control thread
+--echo #
+--disable_query_log
+UPDATE performance_schema.threads
+  SET instrumented='NO' WHERE processlist_id = CONNECTION_ID();
+--enable_query_log
+
+--echo #
+--echo # Clear transaction tables
+--echo #
+CALL clear_transaction_tables();
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 2 - BASIC TRANSACTION
+--echo # ========================================================================
+--echo #
+--connection con1
+SELECT @@global.tx_isolation;
+SELECT @@global.autocommit;
+SELECT @@global.binlog_format;
+SELECT @@tx_isolation;
+SELECT @@autocommit;
+SELECT @@binlog_format;
+
+--echo #
+--echo # STEP 2.1 - START/COMMIT
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (101, 'COMMITTED');
+COMMIT;
+
+--echo #
+--echo # STEP 2.2 - ROLLBACK
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (102, 'ROLLED BACK');
+ROLLBACK;
+
+--echo #
+--echo ## 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);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'ROLLED BACK', 0, '', '', '', '', 'READ WRITE', 'REPEATABLE READ', 'NO', 0, 0, 0, 1);
+CALL clear_transaction_tables();
+
+--echo #
+--echo # STEP 2.3 - COMMIT AND CHAIN
+--echo #
+--connection con1
+START TRANSACTION; 
+INSERT INTO t1 VALUES (103, 'COMMIT AND CHAIN');
+COMMIT AND CHAIN;
+INSERT INTO t1 VALUES (104, 'COMMIT AND CHAIN');
+COMMIT;
+
+--echo #
+--echo ## 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);
+CALL clear_transaction_tables();
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 3 - ISOLATION LEVEL
+--echo # ========================================================================
+--echo #
+--echo # 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;
+
+## NOTE - InnoDB requires binlog_format = ROW for READ COMMITTED/UNCOMMITTED
+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;
+
+--echo #
+--connection default
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', 'SERIALIZABLE', 'NO', 0, 0, 0, 1);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', 'REPEATABLE READ', 'NO', 0, 0, 0, 1);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', 'READ COMMITTED', 'NO', 0, 0, 0, 1);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', 'READ UNCOMMITTED', 'NO', 0, 0, 0, 1);
+CALL clear_transaction_tables();
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 4 - ACCESS MODE
+--echo # ========================================================================
+--echo #
+--echo # STEP 4.1 - READ ONLY, TIMING ENABLED
+--echo #
+--echo #
+--echo # 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;
+COMMIT;
+
+--echo #
+--echo ## 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);
+CALL clear_transaction_tables();
+
+--echo #
+--echo #
+--echo # STEP 4.2 - READ ONLY, TIMING DISABLED
+--echo #
+--echo #
+--echo ## Disable timing stats for 'transaction'
+UPDATE performance_schema.setup_instruments SET timed = 'NO' WHERE name = 'transaction';
+--echo #
+TRUNCATE performance_schema.events_transactions_summary_global_by_event_name;
+
+--echo # connection con1
+--connection con1
+START TRANSACTION;
+SELECT * FROM t1 ORDER BY s1;
+COMMIT;
+--echo #
+SET SESSION TRANSACTION READ WRITE;
+
+--connection default
+--echo #
+--echo ## Expect 1 event, 0 stats
+SELECT * FROM performance_schema.events_transactions_summary_global_by_event_name;
+--echo #
+--echo ## Restore setup_instruments
+UPDATE performance_schema.setup_instruments SET enabled = 'YES' WHERE name = 'transaction';
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 5 - IMPLICIT START
+--echo # ========================================================================
+--echo # When AUTOCOMMIT is disabled, the first statement following a committed
+--echo # transaction marks the start of a new transaction. Subsequent statements will
+--echo # be part of the transaction until it is committed.
+--echo #
+--connection con1
+SET SESSION AUTOCOMMIT = 0;
+INSERT INTO t1 VALUES (501, 'IMPLICIT START');
+
+--echo #
+--echo ## 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);
+
+--connection con1
+INSERT INTO t1 VALUES (502, 'IMPLICIT START');
+COMMIT;
+
+--echo #
+--echo ## 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);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+CALL clear_transaction_tables();
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 6 - IMPLICIT COMMIT (DDL, ETC)
+--echo # ========================================================================
+--echo # Transactions are implicitly ended by DDL statements, locking statements
+--echo # and server administration commands.
+--echo #
+--connection con1
+SET SESSION AUTOCOMMIT = 0;
+INSERT INTO t1 VALUES (601, 'IMPLICIT COMMIT');
+
+--echo #
+--echo ## 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);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', 'NO', 0, 0, 0, 0);
+
+--connection con1
+INSERT INTO t1 VALUES (602, 'IMPLICIT COMMIT');
+
+--echo ## Issue a DDL statement to force a commmit
+CREATE TABLE t2 (s1 INT, s2 VARCHAR(64)) ENGINE=INNODB;
+
+--echo #
+--echo ## 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);
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+CALL clear_transaction_tables();
+DROP TABLE test.t2;
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 7 - XA TRANSACTIONS
+--echo # ========================================================================
+--echo #
+--echo # STEP 7.1 - XA START
+--echo #
+--connection con1
+XA START 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 1234567890;
+
+--echo #
+--echo ## Expect 1 active XA transaction, state ACTIVE
+--connection default
+
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'ACTIVE', 1234567890, 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 'ACTIVE', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+
+--echo #
+--echo # STEP 7.2 - XA END
+--echo #
+--connection con1
+INSERT INTO t1 VALUES (701, 'XA');
+XA END 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 1234567890;
+
+--echo #
+--echo ## 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);
+
+--echo #
+--echo #
+--echo # STEP 7.3 - XA PREPARE
+--echo #
+--connection con1
+XA PREPARE 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 1234567890;
+
+--echo #
+--echo ## 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);
+
+--echo #
+--echo #
+--echo # STEP 7.4 - XA COMMIT
+--echo #
+--connection con1
+XA COMMIT 'XA_CON1_GTRID_001', 'XA_CON1_BQUAL_001', 1234567890;
+
+--echo #
+--echo ## 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);
+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);
+
+CALL clear_transaction_tables();
+
+--echo #
+--echo #
+--echo # STEP 7.5 - XA ROLLBACK
+--echo #
+--connection con1
+XA START 'XA_CON1_002';
+INSERT INTO t1 VALUES (702, 'XA');
+XA END 'XA_CON1_002';
+XA PREPARE 'XA_CON1_002';
+
+--echo #
+--echo ## 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);
+
+--connection con1
+XA ROLLBACK 'XA_CON1_002';
+
+--echo #
+--echo ## 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);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'ROLLED BACK', 0, 'XA_CON1_002', '', 'ROLLBACK ONLY', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+CALL clear_transaction_tables();
+SELECT * FROM performance_schema.events_transactions_current ORDER BY event_id;
+
+--echo #
+--echo # STEP 7.6 - XA TRANSACTION - LONG GTRID AND BQUAL
+--echo #
+--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;
+
+--echo #
+--echo ## 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);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 1234567890, 'GTRID_6789012345678901234567890123456789012345678901234567890123', 'BQUAL_6789012345678901234567890123456789012345678901234567890123', 'COMMITTED', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+CALL clear_transaction_tables();
+
+--echo #
+--echo # STEP 7.7 - XA TRANSACTION - LONG GTRID AND BINARY BQUAL
+--echo #
+--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;
+--echo #
+--echo ## 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);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 1234567890, 'GTRID_6789012345678901234567890123456789012345678901234567890123', '0x425155414C5FA5A53839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233', 'COMMITTED', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+CALL clear_transaction_tables();
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 8 - TRANSACTIONAL AND NON-TRANSACTIONAL TABLES
+--echo # ========================================================================
+--echo #
+--echo ## MariaDB bug: MDEV-6012? MDEV-14436?
+set @mariadb_bug=1;
+
+## Statements that work with non-transactional engines have no effect on the
+## transaction state of the connection. For implicit transactions,
+## the transaction event begins with the first statement that uses a
+## transactional engine. This means that statements operating exclusively on
+## non-transactional tables will be ignored, even following START TRANSACTION.
+
+--connection con1
+SET SESSION AUTOCOMMIT = 0;
+SELECT * FROM performance_schema.events_transactions_current ORDER BY event_id;
+
+--echo #
+--echo #
+--echo # STEP 8.1 - UPDATE NON-TRANSACTIONAL TABLE
+--echo #
+INSERT INTO nt1 VALUES (801, 'NON-TRANSACTIONAL');
+
+--echo #
+--echo ## Expect 0 transactions in events_transactions_current
+--connection default
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
+
+--connection con1
+COMMIT;
+
+--echo #
+--echo ## Expect 0 transactions in events_transactions_history
+--connection default
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
+
+--echo #
+--echo #
+--echo # STEP 8.2 - UPDATE TRANSACTIONAL AND NON-TRANSACTIONAL TABLES
+--echo #
+--echo #
+--echo ## First non-transactional...
+--echo #
+--connection con1
+INSERT INTO nt1 VALUES (802, 'NON-TRANSACTIONAL');
+
+--echo #
+--echo ## Expect 0 transactions in events_transactions_current
+--connection default
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', '', 0, '', '', '', '', '', '', '', 0, 0, 0, @mariadb_bug);
+
+--echo #
+--echo ## Now transactional. Transaction should be started.
+--connection con1
+INSERT INTO t1 VALUES (802, 'TRANSACTIONAL');
+
+--echo #
+--echo ## 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);
+
+## Commit
+--echo #
+--connection con1
+COMMIT;
+
+--echo #
+--echo ## Expect 1 committed transaction in events_transactions_current and history
+--connection default
+CALL transaction_verifier(0, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1+@mariadb_bug);
+CALL clear_transaction_tables();
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 9 - SAVEPOINTS
+--echo # ========================================================================
+--echo #
+--echo # STEP 9.1 - SAVEPOINT 1
+--echo #
+--connection con1
+START TRANSACTION;
+INSERT INTO t1 VALUES (901, 'SAVEPOINT');
+SAVEPOINT SVP001;
+
+--echo #
+--echo ## 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);
+
+--echo #
+--echo #
+--echo # STEP 9.2 - SAVEPOINTS 2 and 3
+--echo #
+--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;
+
+--echo #
+--echo #
+--echo # STEP 9.3 - ROLLBACK TO SAVEPOINT 2
+--echo #
+--connection con1
+ROLLBACK TO SVP002;
+
+--echo #
+--echo ## 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);
+
+--echo #
+--echo #
+--echo # STEP 9.4 - RELEASE SAVEPOINT 1
+--echo #
+--connection con1
+RELEASE SAVEPOINT SVP001;
+
+--echo #
+--echo ## 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);
+
+--echo #
+--echo # STEP 9.5 - COMMIT
+--echo #
+--connection con1
+COMMIT;
+
+--echo #
+--echo ## 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);
+CALL clear_transaction_tables();
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 10 - GTIDs
+--echo # ========================================================================
+--echo # GTIDs are tested in transaction_gtid.test.
+
+--echo #
+--echo # ========================================================================
+--echo # STEP 11 - MISCELLANY
+--echo # ========================================================================
+--echo #
+--echo # STEP 11.1 - TRUNCATE DURING ACTIVE TRANSACTION
+--echo #
+--echo #
+--echo # Verify that truncating events_transactions_current during an active transaction
+--echo # does not leave an orphaned transaction event, and that the row index to
+--echo # events_transactions_history is reset to 0.
+--echo #
+--connection con1
+START TRANSACTION;
+INSERT INTO t1 VALUES (1110, 'INSERT 1110');
+--connection default
+TRUNCATE performance_schema.events_transactions_current;
+--connection con1
+--echo #
+COMMIT;
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (1111, 'INSERT 1111');
+COMMIT;
+
+--echo #
+--echo ## Expect 1 transaction for connection 1
+--connection default
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', '', '', '', 0, 0, 0, 1);
+CALL clear_transaction_tables();
+
+--echo #
+--echo #
+--echo # STEP 11.2 - DISABLE THREAD INSTRUMENTATION
+--echo #
+--connection default
+UPDATE performance_schema.setup_consumers
+  SET enabled = 'NO'
+  WHERE name = 'thread_instrumentation';
+--echo #
+TRUNCATE performance_schema.events_transactions_summary_global_by_event_name;
+
+--connection con1
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (1120, 'INSERT 1120');
+COMMIT;
+
+--connection default
+--echo #
+--echo ## Expect 1 event with non-zero summary stats
+--replace_column 3 sum_timer_wait 4 min_timer_wait 5 avg_timer_wait
+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;
+
+--echo #
+--echo ## Disable timing stats for 'transaction'
+UPDATE performance_schema.setup_instruments SET timed = 'NO' WHERE name = 'transaction';
+--echo #
+TRUNCATE performance_schema.events_transactions_summary_global_by_event_name;
+
+--connection default
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (1121, 'INSERT 1121');
+COMMIT;
+
+--connection default
+--echo #
+--echo ## Expect 1 event, 0 stats
+SELECT * FROM performance_schema.events_transactions_summary_global_by_event_name;
+
+--echo #
+--echo ## 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';
+--echo #
+DELETE FROM t1;
+CALL clear_history();
+
+--echo #
+--echo #
+--echo # STEP 11.3 - STATEMENT ROLLBACK - AUTOCOMMIT OFF - BINLOG FORMAT 'STATEMENT'
+--echo #
+--connection con1
+SET SESSION binlog_format = STATEMENT;
+SET SESSION AUTOCOMMIT = 0;
+
+# A transaction with a rolled back statement should not show as rolled back.
+#
+# Force a statement rollback by attempting to update a transactional table
+# and a non-replicatable table with binlog_format = STATEMENT.
+
+--echo #
+START TRANSACTION;
+INSERT INTO t1 VALUES (1130, 'INSERT 1130');
+--echo #
+--echo ## Expect binlog statement mode error
+--error 0, ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES
+UPDATE t1, performance_schema.setup_instruments pfs
+  SET t1.s1 = 1, pfs.timed = 'NO';
+--echo #
+COMMIT;
+--echo #
+SET SESSION AUTOCOMMIT = 1;
+
+--echo #
+--echo ## Expect 1 committed transaction
+--connection default
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'COMMITTED', 0, '', '', '', '', '', '', 'NO', 0, 0, 0, 1);
+--echo #
+DELETE FROM t1;
+CALL clear_history();
+
+--echo #
+--echo #
+--echo # STEP 11.4 - STATEMENT ROLLBACK - AUTOCOMMIT ON - BINLOG FORMAT 'STATEMENT'
+--echo #
+--connection con1
+SET SESSION binlog_format = STATEMENT;
+SET SESSION AUTOCOMMIT = 1;
+
+# A rolled back autocommit statement should be recorded as a rolled back transaction
+#
+# Force a statement rollback by attempting to update a transactional table
+# and a non-replicatable table with binlog_format = STATEMENT.
+--echo #
+--echo ## Expect binlog statement mode error
+--error 0, ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES
+UPDATE t1, performance_schema.setup_instruments pfs
+  SET t1.s1 = 1, pfs.timed = 'NO';
+
+--echo #
+--echo ## Expect 1 rolled back transaction
+--connection default
+CALL transaction_verifier(1, @con1_thread_id, 'transaction', 'ROLLED BACK', 0, '', '', '', '', '', '', 'YES', 0, 0, 0, 1);
+CALL clear_history();
+
+--disable_parsing
+# TODO: Add wait timer 
+--echo #
+--echo #
+--echo # STEP 11.5 - DROPPED CONNECTION DURING TRANSACTION
+--echo #
+--connection con2
+START TRANSACTION;
+INSERT INTO t1 VALUES (1150, 'DROP CONNECTION');
+--echo #
+--echo ## Expect 1 active transaction for connection 2
+--connection default
+CALL transaction_verifier(0, @con2_thread_id, 'transaction', 'ACTIVE', 0, '', '', '', '', 'READ WRITE', '', 'NO', 0, 0, 0, 1);
+
+--echo #
+--echo ## Drop connection
+--connection con2
+--disconnect con2
+--source include/wait_until_disconnected.inc
+--connection default
+
+--echo #
+--echo ## Expect 0 transactions for connection 2
+CALL transaction_verifier(0, @con2_thread_id, '', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0);
+CALL transaction_verifier(1, @con2_thread_id, '', '', 0, '', '', '', '', '', '', '', 0, 0, 0, 0);
+CALL clear_transaction_tables();
+
+--enable_parsing
+
+--echo #
+--echo # ========================================================================
+--echo # CLEAN UP
+--echo # ========================================================================
+--echo #
+
+--disconnect con1
+##--disconnect con2
+
+--connection default
+DROP TABLE t1;
+DROP TABLE nt1;
+
+--source ../include/transaction_cleanup.inc
+set global binlog_format=default;
diff --git a/mysql-test/suite/perfschema/t/transaction_gtid.test b/mysql-test/suite/perfschema/t/transaction_gtid.test
new file mode 100644
index 00000000000..c97c042b943
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/transaction_gtid.test
@@ -0,0 +1,194 @@
+# ==== Purpose ====
+#
+# Verify that the GTID column of
+# performance_schema.events_transactions_current and
+# performance_schema.events_transactions_history has the correct
+# value, during different parts of the transaction life cycle.
+#
+# There are several cases:
+#
+# - When GTID_MODE=ON, a GTID of the form UUID:NUMBER is generated.
+#   When GTID_MODE=OFF, transactions have the special GTID
+#   "ANONYMOUS".
+#
+# - On a master, the GTID is generated during the transaction commit;
+#   prior to that it is "AUTOMATIC". On a slave, the GTID is specified
+#   (using SET GTID_NEXT) prior to executing the transaction.
+#
+# ==== Implementation ====
+#
+# Execute a transaction like:
+#   BEGIN;
+#   INSERT;
+#   COMMIT;
+# On a different connection, check the GTID columns of the tables
+# between each statement.
+#
+# Transactions to be checked are executed on connection
+# 'default'. Auxiliary statements to read or truncate the tables are
+# executed on connection 'server_1'.
+#
+# Also execute a ROLLBACK transaction.
+#
+# Execute the transaction in these two cases:
+# - GTID_MODE=ON,
+# - GTID_MODE=OFF.
+#
+# Execute the transaction in these two cases:
+# - GTID_NEXT='UUID:NUMBER'/'ANONYMOUS' (when GTID_MODE=ON/OFF)
+# - GTID_NEXT='AUTOMATIC'.
+#
+# Due to implementation details, there is a window in time at the
+# beginning of the transaction when the GTID has not been copied from
+# the server to the performance_schema internal structures.  During
+# this window, the GTID should be AUTOMATIC even if GTID_NEXT is set
+# to 'UUID:NUMBER' or 'ANONYMOUS'.  To verify this, we use a debug
+# sync point during the execution of the BEGIN statement.
+#
+# ==== References ====
+#
+# WL#7592: GTIDS: generate Gtid_log_event and Previous_gtids_log_event always
+# - The current behavior was specified and the test was introduced in
+#   this worklog.
+
+--source include/have_debug_sync.inc
+--source include/not_gtid_enabled.inc
+--let $rpl_topology= none
+--let $rpl_server_count= 1
+--source include/rpl_init.inc
+
+--echo # ==== Configure ====
+
+--connection default
+
+SET GLOBAL ENFORCE_GTID_CONSISTENCY = ON;
+
+--let $thread_id= `SELECT THREAD_ID FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID()`
+--let $server_uuid= `SELECT @@GLOBAL.SERVER_UUID`
+
+CREATE TABLE t1 (a INT);
+
+# These are parameters to include/execute_at_sync_point.inc,
+# which will remain the same each time the script is invoked.
+--let $statement_connection= default
+--let $auxiliary_connection= server_1
+--let $auxiliary_file= suite/perfschema/include/show_transaction_gtid.inc
+--let $quiet= 1
+
+--echo # ==== Test ====
+
+--let $n= 1
+while ($n <= 4) {
+  if ($n == 1) {
+    --echo ---- Case 1: Specify ANONYMOUS prior to transaction ----
+    --let $gtid= ANONYMOUS
+  }
+  if ($n == 2) {
+    --echo ---- Case 2: Generate ANONYMOUS at commit ----
+    --let $gtid= AUTOMATIC
+  }
+  if ($n == 3) {
+    --let $rpl_gtid_mode= ON
+    --source include/rpl_set_gtid_mode.inc
+    --echo ---- Case 3: Specify GTID prior to transaction ----
+    --let $gtid= aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa:1
+  }
+  if ($n == 4) {
+    --echo ---- Case 4: Generate GTID at commit ----
+    --let $gtid= AUTOMATIC
+  }
+
+  # Execute a transaction, show the GTID column of the tables
+  # after ROLLBACK.
+
+  --echo * BEGIN ... ROLLBACK
+  --source ../include/reset_transaction_gtid.inc
+
+  --source ../include/show_transaction_gtid.inc
+  eval SET SESSION GTID_NEXT = '$gtid';
+  BEGIN;
+  eval INSERT INTO t1 VALUES ($n);
+  ROLLBACK;
+  --source ../include/show_transaction_gtid.inc
+
+  # Same transaction as above, but with a commit. Show the GTID column
+  # of the tables between each statement, as well as in the middle of
+  # the BEGIN statement.
+
+  --echo * BEGIN ... COMMIT
+  --source ../include/reset_transaction_gtid.inc
+
+  --source ../include/show_transaction_gtid.inc
+  eval SET SESSION GTID_NEXT = '$gtid';
+  --source ../include/show_transaction_gtid.inc
+  --let $statement= BEGIN
+  --let $sync_point= after_set_transaction_psi_before_set_transaction_gtid
+  --source include/execute_at_sync_point.inc
+  --source ../include/show_transaction_gtid.inc
+  eval INSERT INTO t1 VALUES ($n);
+  --source ../include/show_transaction_gtid.inc
+  COMMIT;
+  --source ../include/show_transaction_gtid.inc
+
+  # A transaction executed with AUTOCOMMIT=OFF and no BEGIN.  Show the
+  # GTID column between each statement, as well as in the middle of
+  # the first DML statement.
+
+  --echo * AUTOCOMMIT = OFF
+  SET @@SESSION.AUTOCOMMIT = 0;
+  --source ../include/reset_transaction_gtid.inc
+
+  --source ../include/show_transaction_gtid.inc
+  eval SET SESSION GTID_NEXT = '$gtid';
+  --source ../include/show_transaction_gtid.inc
+  --let $statement= INSERT INTO t1 VALUES ($n)
+  --let $sync_point= begin_decide_logging_format
+  --source include/execute_at_sync_point.inc
+  --source ../include/show_transaction_gtid.inc
+  COMMIT;
+  --source ../include/show_transaction_gtid.inc
+
+  # A single-statement transaction executed with AUTOCOMMIT=ON and no
+  # BEGIN.  Show the GTID column before and after, as well as in the
+  # middle of the statement.
+
+  --echo * AUTOCOMMIT = ON
+  SET @@SESSION.AUTOCOMMIT = 1;
+  --source ../include/reset_transaction_gtid.inc
+
+  --source ../include/show_transaction_gtid.inc
+  eval SET SESSION GTID_NEXT = '$gtid';
+  --source ../include/show_transaction_gtid.inc
+  --let $statement= INSERT INTO t1 VALUES ($n)
+  --let $sync_point= begin_decide_logging_format
+  --source include/execute_at_sync_point.inc
+  --source ../include/show_transaction_gtid.inc
+
+  # Disabled because DDL is not inserted into the tables
+  if (0) {
+  # An implicitly committing statement (DDL), no BEGIN.
+  --echo * implicit commit (DDL)
+  --source ../include/reset_transaction_gtid.inc
+
+  --source ../include/show_transaction_gtid.inc
+  eval SET SESSION GTID_NEXT = '$gtid';
+  --source ../include/show_transaction_gtid.inc
+  --let $statement= CREATE TABLE t_$n (a INT)
+  --let $sync_point= begin_decide_logging_format
+  --source include/execute_at_sync_point.inc
+  --source ../include/show_transaction_gtid.inc
+  }
+
+  --inc $n
+}
+
+--echo # ==== Clean up ====
+
+DROP TABLE t1;
+# DROP TABLE t_1, t_2, t_3, t_4;
+
+--let $rpl_gtid_mode= OFF
+--source include/rpl_set_gtid_mode.inc
+SET GLOBAL ENFORCE_GTID_CONSISTENCY = OFF;
+
+--source include/rpl_end.inc
diff --git a/mysql-test/suite/perfschema/t/transaction_nested_events-master.opt b/mysql-test/suite/perfschema/t/transaction_nested_events-master.opt
new file mode 100644
index 00000000000..d68f0498edf
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/transaction_nested_events-master.opt
@@ -0,0 +1,19 @@
+--event-scheduler
+--query_cache_size=0
+--loose-performance_schema_events_statements_history_size=20
+--loose-performance_schema_events_statements_history_long_size=50
+--loose-performance_schema_events_transactions_history_long_size=50
+--loose-performance_schema_max_thread_instances=30
+
+--loose-performance-schema-consumer-events-stages-current=OFF
+--loose-performance-schema-consumer-events-stages-history=OFF
+--loose-performance-schema-consumer-events-stages-history-long=OFF
+--loose-performance-schema-consumer-events-statements-current=ON
+--loose-performance-schema-consumer-events-statements-history=ON
+--loose-performance-schema-consumer-events-statements-history-long=ON
+--loose-performance-schema-consumer-events-transactions-current=ON
+--loose-performance-schema-consumer-events-transactions-history=ON
+--loose-performance-schema-consumer-events-transactions-history-long=ON
+--loose-performance-schema-consumer-events-waits-current=OFF
+--loose-performance-schema-consumer-events-waits-history=OFF
+--loose-performance-schema-consumer-events-waits-history-long=OFF
diff --git a/mysql-test/suite/perfschema/t/transaction_nested_events.test b/mysql-test/suite/perfschema/t/transaction_nested_events.test
new file mode 100644
index 00000000000..1be7dc0f937
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/transaction_nested_events.test
@@ -0,0 +1,387 @@
+########## suite/perfschema/t/transaction_nested_events.test #########
+#                                                                    #
+# This test checks the following                                     #
+# 1) nested events                                                   #
+# 2) various scenarios of stored program & transaction combinations  #
+#                                                                    #
+#                                                                    #
+######################################################################
+
+--source include/have_perfschema.inc
+--source include/not_embedded.inc
+--source include/have_innodb.inc
+--source include/no_protocol.inc
+--source include/maybe_pool_of_threads.inc
+
+--disable_query_log
+--source ../include/transaction_setup.inc
+--enable_query_log
+
+--echo #
+--echo #========================================================================
+--echo # STEP 1 - SETUP
+--echo #========================================================================
+
+--echo #
+--echo ## Setup control thread
+--echo #
+--connection default
+SET SESSION AUTOCOMMIT= 1;
+--disable_warnings
+USE test;
+DROP DATABASE IF EXISTS db;
+--enable_warnings
+--echo #
+--echo ## 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;
+
+--echo #
+--echo ## Setup connection 1
+connect(con1, localhost, root,,);
+USE db;
+SET SESSION AUTOCOMMIT = 1;
+eval $get_thread_id;
+let $con1_thread_id= `SELECT @my_thread_id`;
+
+--connection default
+--disable_query_log
+eval SET @con1_thread_id= $con1_thread_id;
+--enable_query_log
+
+--echo #
+--echo ## Disable events from the control (default) connection
+UPDATE performance_schema.threads SET instrumented = 'NO' WHERE processlist_id = CONNECTION_ID();
+
+# Use this to select events from all threads
+eval SET @all_threads= 0;
+
+--echo #
+--echo ## 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';
+
+--echo #
+--echo ## Clear statement and transaction history
+CALL test.clear_history();
+
+--echo #
+--echo #========================================================================
+--echo # STEP 2 - BASIC TRANSACTION
+--echo #========================================================================
+--echo #
+--echo # STEP 2.1 - IMPLICIT
+--echo #
+--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;
+
+## Verify and reset
+--source ../include/transaction_nested_events_verifier.inc
+
+--echo #
+--echo # STEP 2.2 - EXPLICIT
+--echo #
+--connection con1
+START TRANSACTION;
+INSERT INTO t1 VALUES (220, "INSERT 220"), (221, "INSERT 221");
+UPDATE t1 SET s2 = "UPDATE 221" WHERE s1 = 221;
+COMMIT;
+
+## Verify and reset
+--source ../include/transaction_nested_events_verifier.inc
+
+--echo #========================================================================
+--echo # STEP 3 - TRANSACTIONS AND STORED PROCEDURES
+--echo #========================================================================
+--echo #
+--echo # STEP 3.1 - STORED PROCEDURE STARTED WITHIN TRANSACTION
+--echo #
+--connection con1
+CREATE PROCEDURE tp_update() UPDATE t1 SET s1 = s1 + 1;
+--echo #
+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;
+
+## Verify and reset
+--source ../include/transaction_nested_events_verifier.inc
+
+--echo #
+--echo # STEP 3.2 - TRANSACTION STARTED WITHIN STORED PROCEDURE
+--echo #
+--connection con1
+CREATE PROCEDURE tp_start() START TRANSACTION;
+--echo #
+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;
+--echo #
+SELECT * FROM t1 ORDER BY s1;
+COMMIT;
+
+## Verify and reset
+--source ../include/transaction_nested_events_verifier.inc
+
+--echo #
+--echo # STEP 3.3 - TRANSACTION ENDED WITHIN STORED PROCEDURE
+--echo #
+--connection con1
+CREATE PROCEDURE tp_rollback() ROLLBACK;
+CREATE PROCEDURE tp_commit() COMMIT;
+
+--echo #
+--echo ## 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();
+--echo #
+SELECT * FROM t1 ORDER BY s1;
+
+--echo #
+--echo ## ROLLBACK within stored procedure
+START TRANSACTION;
+UPDATE t1 SET s1 = s1*2 WHERE s1 > 331;
+CALL tp_rollback();
+--echo #
+SELECT * FROM t1 ORDER BY s1;
+
+## Verify and reset
+--source ../include/transaction_nested_events_verifier.inc
+
+--echo #========================================================================
+--echo # STEP 4 - TRANSACTIONS AND STORED FUNCTIONS
+--echo #========================================================================
+--echo #
+--echo #
+--echo # STEP 4.1 - FUNCTION WITHIN A TRANSACTION
+--echo #
+--connection con1
+DELIMITER |;
+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 |
+DELIMITER ;|
+
+--echo #
+--echo ## Clear history
+--connection default
+CALL test.clear_history();
+--connection con1
+
+--echo #
+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;
+--echo #
+SELECT * FROM t1 ORDER BY s1;
+--echo #
+SELECT fn_add(413, 414);
+COMMIT;
+--echo #
+SELECT * FROM t1 ORDER BY s1;
+
+## Verify and reset
+--source ../include/transaction_nested_events_verifier.inc
+
+--connection con1
+--echo #
+--echo ## Again, but this time with a rollback
+--echo #
+START TRANSACTION;
+SELECT fn_add(415, 416);
+--echo #
+ROLLBACK;
+--echo #
+SELECT * FROM t1 ORDER BY s1;
+
+## Verify and reset
+--source ../include/transaction_nested_events_verifier.inc
+
+--echo #
+--echo # STEP 4.2 - TRANSACTION CANNOT BE STARTED OR ENDED WITHIN FUNCTION
+--echo #
+--connection con1
+DELIMITER |;
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+CREATE FUNCTION fn_err1() RETURNS VARCHAR(10) BEGIN START TRANSACTION ; RETURN 'invalid' ; END|
+DELIMITER ;|
+
+--echo #
+--echo ## Expect 0 transactions
+--connection default
+SELECT COUNT(*) FROM performance_schema.events_transactions_history;
+--connection con1
+
+--echo #
+--echo ## Expect stored function does not exist
+--echo #
+--error ER_SP_DOES_NOT_EXIST
+SELECT fn_err1();
+
+--echo #
+--echo ## Expect 1 transactions
+--connection default
+SELECT COUNT(*) FROM performance_schema.events_transactions_history;
+--connection con1
+
+--echo #
+DELIMITER |;
+--error ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
+CREATE FUNCTION fn_err2() RETURNS VARCHAR(10) BEGIN COMMIT; RETURN 'invalid' ; END|
+DELIMITER ;|
+
+--echo #
+--echo ## Expect stored function does not exist
+--echo #
+START TRANSACTION;
+DELETE FROM t1 WHERE s1 > 320;
+--error ER_SP_DOES_NOT_EXIST
+SELECT fn_err2();
+
+--echo #
+--echo ## Expect 2 transactions
+--connection default
+SELECT COUNT(*) FROM performance_schema.events_transactions_history;
+
+--echo #
+--echo ## Clear transaction and statement tables
+CALL test.clear_history();
+
+--echo #========================================================================
+--echo # STEP 5 - TRANSACTIONS AND TRIGGERS
+--echo #========================================================================
+--echo #
+--echo #
+--echo # STEP 5.1 - FORCE STATEMENT ROLLBACK FROM TRIGGER
+--echo #
+--connection con1
+--echo ## Create a trigger to force statement rollback
+--echo #
+DELIMITER |;
+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;|
+DELIMITER ;|
+
+--echo #
+--echo ## Clear history
+--connection default
+CALL test.clear_history();
+--connection con1
+
+--echo #
+--echo ## Insert multiple rows, then update. Trigger will force rollback the
+--echo ## UPDATE statement, but the transaction should not roll back.
+--echo #
+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");
+--echo #
+SELECT * FROM t1 ORDER BY s1;
+--echo #
+--echo ## Expect error when UPDATE hits record 505
+--echo #
+--error ER_SIGNAL_EXCEPTION
+UPDATE t1 SET s1 = s1 * 2 WHERE s1 >= 500;
+--echo #
+--echo ## Verify that INSERT succeeded, UPDATE failed and transaction did not rollback
+--echo #
+SELECT * FROM t1 ORDER BY s1;
+COMMIT;
+--echo #
+DROP TRIGGER trigger_before_update;
+
+## Verify and reset
+--source ../include/transaction_nested_events_verifier.inc
+
+--echo # TODO: Detect statement events from scheduled event
+--disable_parsing
+--echo #========================================================================
+--echo # STEP 6 - SCHEDULED EVENTS
+--echo #========================================================================
+--connection con1
+
+# Check that the event_scheduler is really running
+#--source include/running_event_scheduler.inc
+
+--echo #
+--echo ## Create a one-time event that will insert, update, commit and rollback.
+--echo #
+DELIMITER |;
+CREATE EVENT trx_event ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 5 SECOND DO
+BEGIN
+  START TRANSACTION;
+  INSERT INTO t1 VALUES (600, "INSERT 600");
+  INSERT INTO t1 VALUES (601, "INSERT 601");
+  INSERT INTO t1 VALUES (602, "INSERT 602");
+  COMMIT;
+  START TRANSACTION;
+  UPDATE t1 SET s1 = s1 + 1, s2 = 'THIS SHOULD NOT BE HERE';
+  ROLLBACK;
+  START TRANSACTION;
+  INSERT INTO t1 VALUES (699, "INSERT 699");
+  COMMIT;
+END;|
+DELIMITER ;|
+
+--echo #
+--echo ## Clear history
+--connection default
+CALL test.clear_history();
+--connection con1
+--echo #
+--echo ## Wait a few seconds for scheduled event to execute and finish.
+# Check based on the expected content in t1.
+let $wait_condition= SELECT COUNT(*) = 4 FROM t1;
+--source include/wait_condition.inc
+--echo #
+--echo ## Confirm that the scheduled event completed and the content of t1 is right.
+--echo #
+SELECT * FROM t1 ORDER BY s1;
+--echo #
+--echo ## Verify and reset
+--echo #
+eval SET @all_threads= 1;
+--source ../include/transaction_nested_events_verifier.inc
+eval SET @all_threads= 0;
+
+--enable_parsing
+
+--echo #=======================================================================
+--echo # Cleanup
+--echo #=======================================================================
+--connection con1
+--disconnect con1
+--source include/wait_until_disconnected.inc
+--connection default
+DROP DATABASE db;
+UPDATE performance_schema.setup_instruments SET enabled='YES', timed='YES';
+
+--source ../include/transaction_cleanup.inc
+
+
+
diff --git a/mysql-test/suite/perfschema/t/user_var_func.test b/mysql-test/suite/perfschema/t/user_var_func.test
new file mode 100644
index 00000000000..3c9ea4f3cf3
--- /dev/null
+++ b/mysql-test/suite/perfschema/t/user_var_func.test
@@ -0,0 +1,101 @@
+
+--source include/not_embedded.inc
+--source include/have_perfschema.inc
+
+set @v1a="Hello";
+set @v2a="World";
+set @v3a=65;
+set @v4a=NULL;
+
+select @v1a, @v2a, @v3a, @v4a, @v_unknown;
+
+select VARIABLE_NAME, VARIABLE_VALUE
+  from performance_schema.user_variables_by_thread
+  order by VARIABLE_NAME;
+
+connect(con1, localhost, root,,);
+
+set @v1b="Salut";
+set @v2b="La compagnie";
+set @v3b=12;
+set @v4b=NULL;
+
+select @v1b, @v2b, @v3b, @v4b, @v_unknown;
+
+select VARIABLE_NAME, VARIABLE_VALUE
+  from performance_schema.user_variables_by_thread
+  order by VARIABLE_NAME;
+
+--connection default
+--disconnect con1
+
+# Wait till all disconnects are completed
+let $count_sessions= 1;
+--source include/wait_until_count_sessions.inc
+
+select VARIABLE_NAME, VARIABLE_VALUE
+  from performance_schema.user_variables_by_thread
+  order by VARIABLE_NAME;
+
+# Make sure large values are not truncated
+set @blob_under_16_bits=repeat("a", 65000);
+set @blob_under_24_bits=repeat("a", 1000000);
+
+# Not testable because of limitation on max_allowed_packet
+# set @blob_under_32_bits=repeat("a", 20000000);
+
+select length(@blob_under_16_bits);
+select length(@blob_under_24_bits);
+# select length(@blob_under_32_bits);
+
+select variable_name, length(variable_value)
+  from performance_schema.user_variables_by_thread
+  where VARIABLE_NAME like "blob%"
+  order by VARIABLE_NAME;
+
+
+# Check the behaviour with procedures if the values passed inside procedures gets reflected in the table performance_schema.user_variables_by_thread. 
+
+set @a=10;
+
+DELIMITER |;
+CREATE procedure test_user_val
+(IN input INT,OUT output INT)
+BEGIN
+    SELECT input + input
+    INTO output;
+END|
+DELIMITER ;|
+
+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;
+
+
+# Checking behaviour around triggers if the values in performance_schema.user_variables_by_thread are updated from within trigger
+
+create table t1 (c1 int);
+
+DELIMITER |;
+CREATE TRIGGER test_uvar_trigger
+    AFTER INSERT ON t1
+     FOR EACH ROW BEGIN
+     set @a=@a+@a;
+END|
+DELIMITER ;|
+
+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;
+
+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;
+
+drop table t1;
+drop procedure test_user_val;
+#drop TRIGGER test_uvar_trigger;
+
+
+
+
diff --git a/mysql-test/suite/perfschema/t/view_table_io.test b/mysql-test/suite/perfschema/t/view_table_io.test
index 703f5414ba4..f5b017dc8ad 100644
--- a/mysql-test/suite/perfschema/t/view_table_io.test
+++ b/mysql-test/suite/perfschema/t/view_table_io.test
@@ -3,6 +3,9 @@
 #       base table used within the view shows up whereas
 #       the view itself never shows up.
 
+## To skip the test with QC enabled till BUG#14830950 is fixed.
+#-- source include/have_QC_Disabled.inc
+
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 --source ../include/table_io_setup_helper.inc