Update row and key fetch cost models to take into account data copy costs

Before this patch, when calculating the cost of fetching and using a
row/key from the engine, we took into account the cost of finding a
row or key from the engine, but did not consistently take into account
index only accessed, clustered key or covered keys for all access
paths.

The cost of the WHERE clause (TIME_FOR_COMPARE) was not consistently
considered in best_access_path().  TIME_FOR_COMPARE was used in
calculation in other places, like greedy_search(), but was in some
cases (like scans) done an a different number of rows than was
accessed.

The cost calculation of row and index scans didn't take into account
the number of rows that where accessed, only the number of accepted
rows.

When using a filter, the cost of index_only_reads and cost of
accessing and disregarding 'filtered rows' where not taken into
account, which made filters cost less than there actually where.

To remedy the above, the following key & row fetch related costs
has been added:

- The cost of fetching and using a row is now split into different costs:
  - key + Row fetch cost (as before) but multiplied with the variable
  'optimizer_cache_cost' (default to 0.5). This allows the user to
  tell the optimizer the likehood of finding the key and row in the
  engine cache.
- ROW_COPY_COST, The cost copying a row from the engine to the
  sql layer or creating a row from the join_cache to the record
  buffer. Mostly affects table scan costs.
- ROW_LOOKUP_COST, the cost of fetching a row by rowid.
- KEY_COPY_COST the cost of finding the next key and copying it from
  the engine to the SQL layer. This is used when we calculate the cost
  index only reads. It makes index scans more expensive than before if
  they cover a lot of rows. (main.index_merge_myisam)
- KEY_LOOKUP_COST, the cost of finding the first key in a range.
  This replaces the old define IDX_LOOKUP_COST, but with a higher cost.
- KEY_NEXT_FIND_COST, the cost of finding the next key (and rowid).
  when doing a index scan and comparing the rowid to the filter.
  Before this cost was assumed to be 0.

All of the above constants/variables are now tuned to be somewhat in
proportion of executing complexity to each other.  There is tuning
need for these in the future, but that can wait until the above are
made user variables as that will make tuning much easier.

To make the usage of the above easy, there are new (not virtual)
cost calclation functions in handler:
- ha_read_time(), like read_time(), but take optimizer_cache_cost into
  account.
- ha_read_and_copy_time(), like ha_read_time() but take into account
  ROW_COPY_TIME
- ha_read_and_compare_time(), like ha_read_and_copy_time() but take
  TIME_FOR_COMPARE into account.
- ha_rnd_pos_time(). Read row with row id, taking ROW_COPY_COST
  into account.  This is used with filesort where we don't need
  to execute the WHERE clause again.
- ha_keyread_time(), like keyread_time() but take
  optimizer_cache_cost into account.
- ha_keyread_and_copy_time(), like ha_keyread_time(), but add
  KEY_COPY_COST.
- ha_key_scan_time(), like key_scan_time() but take
  optimizer_cache_cost nto account.
- ha_key_scan_and_compare_time(), like ha_key_scan_time(), but add
  KEY_COPY_COST & TIME_FOR_COMPARE.

I also added some setup costs for doing different types of scans and
creating temporary tables (on disk and in memory). This encourages
the optimizer to not use these for simple 'a few row' lookups if
there are adequate key lookup strategies.
- TABLE_SCAN_SETUP_COST, cost of starting a table scan.
- INDEX_SCAN_SETUP_COST, cost of starting an index scan.
- HEAP_TEMPTABLE_CREATE_COST, cost of creating in memory
  temporary table.
- DISK_TEMPTABLE_CREATE_COST, cost of creating an on disk temporary
  table.

When calculating cost of fetching ranges, we had a cost of
IDX_LOOKUP_COST (0.125) for doing a key div for a new range. This is
now replaced with 'io_cost * KEY_LOOKUP_COST (1.0) *
optimizer_cache_cost', which matches the cost we use for 'ref' and
other key lookups. The effect is that the cost is now a bit higher
when we have many ranges for a key.

Allmost all calculation with TIME_FOR_COMPARE is now done in
best_access_path(). 'JOIN::read_time' now includes the full
cost for finding the rows in the table.

In the result files, many of the changes are now again close to what
they where before the "Update cost for hash and cached joins" commit,
as that commit didn't fix the filter cost (too complex to do
everything in one commit).

The above changes showed a lot of a lot of inconsistencies in
optimizer cost calculation. The main objective with the other changes
was to do calculation as similar (and accurate) as possible and to make
different plans more comparable.

Detailed list of changes:

- Calculate index_only_cost consistently and correctly for all scan
  and ref accesses. The row fetch_cost and index_only_cost now
  takes into account clustered keys, covered keys and index
  only accesses.
- cost_for_index_read now returns both full cost and index_only_cost
- Fixed cost calculation of get_sweep_read_cost() to match other
  similar costs. This is bases on the assumption that data is more
  often stored on SSD than a hard disk.
- Replaced constant 2.0 with new define TABLE_SCAN_SETUP_COST.
- Some scan cost estimates did not take into account
  TIME_FOR_COMPARE. Now all scan costs takes this into
  account. (main.show_explain)
- Added session variable optimizer_cache_hit_ratio (default 50%). By
  adjusting this on can reduce or increase the cost of index or direct
  record lookups. The effect of the default is that key lookups is now
  a bit cheaper than before. See usage of 'optimizer_cache_cost' in
  handler.h.
- JOIN_TAB::scan_time() did not take into account index only scans,
  which produced a wrong cost when index scan was used. Changed
  JOIN_TAB:::scan_time() to take into consideration clustered and
  covered keys. The values are now cached and we only have to call
  this function once. Other calls are changed to use the cached
  values.  Function renamed to JOIN_TAB::estimate_scan_time().
- Fixed that most index cost calculations are done the same way and
  more close to 'range' calculations. The cost is now lower than
  before for small data sets and higher for large data sets as we take
  into account how many keys are read (main.opt_trace_selectivity,
  main.limit_rows_examined).
- Ensured that index_scan_cost() ==
  range(scan_of_all_rows_in_table_using_one_range) +
  MULTI_RANGE_READ_INFO_CONST. One effect of this is that if there
  is choice of doing a full index scan and a range-index scan over
  almost the whole table then index scan will be preferred (no
  range-read setup cost).  (innodb.innodb, main.show_explain,
  main.range)
  - Fixed the EQ_REF and REF takes into account clustered and covered
    keys.  This changes some plans to use covered or clustered indexes
    as these are much cheaper.  (main.subselect_mat_cost,
    main.state_tables_innodb, main.limit_rows_examined)
  - Rowid filter setup cost and filter compare cost now takes into
    account fetching and checking the rowid (KEY_NEXT_FIND_COST).
    (main.partition_pruning heap.heap_btree main.log_state)
  - Added KEY_NEXT_FIND_COST to
    Range_rowid_filter_cost_info::lookup_cost to account of the time
    to find and check the next key value against the container
  - Introduced ha_keyread_time(rows) that takes into account finding
    the next row and copying the key value to 'record'
    (KEY_COPY_COST).
  - Introduced ha_key_scan_time() for calculating an index scan over
    all rows.
  - Added IDX_LOOKUP_COST to keyread_time() as a startup cost.
  - Added index_only_fetch_cost() as a convenience function to
    OPT_RANGE.
  - keyread_time() cost is slightly reduced to prefer shorter keys.
    (main.index_merge_myisam)
  - All of the above caused some index_merge combinations to be
    rejected because of cost (main.index_intersect). In some cases
    'ref' where replaced with index_merge because of the low
    cost calculation of get_sweep_read_cost().
  - Some index usage moved from PRIMARY to a covering index.
    (main.subselect_innodb)
- Changed cost calculation of filter to take KEY_LOOKUP_COST and
  TIME_FOR_COMPARE into account.  See sql_select.cc::apply_filter().
  filter parameters and costs are now written to optimizer_trace.
- Don't use matchings_records_in_range() to try to estimate the number
  of filtered rows for ranges. The reason is that we want to ensure
  that 'range' is calculated similar to 'ref'. There is also more work
  needed to calculate the selectivity when using ranges and ranges and
  filtering.  This causes filtering column in EXPLAIN EXTENDED to be
  100.00 for some cases where range cannot use filtering.
  (main.rowid_filter)
- Introduced ha_scan_time() that takes into account the CPU cost of
  finding the next row and copying the row from the engine to
  'record'. This causes costs of table scan to slightly increase and
  some test to changed their plan from ALL to RANGE or ALL to ref.
  (innodb.innodb_mysql, main.select_pkeycache)
  In a few cases where scan time of very small tables have lower cost
  than a ref or range, things changed from ref/range to ALL.
  (main.myisam, main.func_group, main.limit_rows_examined,
  main.subselect2)
- Introduced ha_scan_and_compare_time() which is like ha_scan_time()
  but also adds the cost of the where clause (TIME_FOR_COMPARE).
- Added small cost for creating temporary table for
  materialization. This causes some very small tables to use scan
  instead of materialization.
- Added checking of the WHERE clause (TIME_FOR_COMPARE) of the
  accepted rows to ROR costs in get_best_ror_intersect()
- Removed '- 0.001' from 'join->best_read' and optimize_straight_join()
  to ensure that the 'Last_query_cost' status variable contains the
  same value as the one that was calculated by the optimizer.
- Take avg_io_cost() into account in handler::keyread_time() and
  handler::read_time(). This should have no effect as it's 1.0 by
  default, except for heap that overrides these functions.
- Some 'ref_or_null' accesses changed to 'range' because of cost
  adjustments (main.order_by)
- Added scan type "scan_with_join_cache" for optimizer_trace. This is
  just to show in the trace what kind of scan was used.
- When using 'scan_with_join_cache' take into account number of
  preceding tables (as have to restore all fields for all previous
  table combination when checking the where clause)
  The new cost added is:
  (row_combinations * ROW_COPY_COST * number_of_cached_tables).
  This increases the cost of join buffering in proportion of the
  number of tables in the join buffer. One effect is that full scans
  are now done earlier as the cost is then smaller.
  (main.join_outer_innodb, main.greedy_optimizer)
- Removed the usage of 'worst_seeks' in cost_for_index_read as it
  caused wrong plans to be created; It prefered JT_EQ_REF even if it
  would be much more expensive than a full table scan. A related
  issue was that worst_seeks only applied to full lookup, not to
  clustered or index only lookups, which is not consistent. This
  caused some plans to use index scan instead of eq_ref (main.union)
- Changed federated block size from 4096 to 1500, which is the
  typical size of an IO packet.
- Added costs for reading rows to Federated. Needed as there is no
  caching of rows in the federated engine.
- Added ha_innobase::rnd_pos_time() cost function.
- A lot of extra things added to optimizer trace
  - More costs, especially for materialization and index_merge.
  - Make lables more uniform
  - Fixed a lot of minor bugs
  - Added 'trace_started()' around a lot of trace blocks.
- When calculating ORDER BY with LIMIT cost for using an index
  the cost did not take into account the number of row retrivals
  that has to be done or the cost of comparing the rows with the
  WHERE clause. The cost calculated would be just a fraction of
  the real cost. Now we calculate the cost as we do for ranges
  and 'ref'.
- 'Using index for group-by' is used a bit more than before as
  now take into account the WHERE clause cost when comparing
  with 'ref' and prefer the method with fewer row combinations.
  (main.group_min_max).

Bugs fixed:
- Fixed that we don't calculate TIME_FOR_COMPARE twice for some plans,
  like in optimize_straight_join() and greedy_search()
- Fixed bug in save_explain_data where we could test for the wrong
  index when displaying 'Using index'. This caused some old plans to
  show 'Using index'.  (main.subselect_innodb, main.subselect2)
- Fixed bug in get_best_ror_intersect() where 'min_cost' was not
  updated, and the cost we compared with was not the one that was
  used.
- Fixed very wrong cost calculation for priority queues in
  check_if_pq_applicable(). (main.order_by now correctly uses priority
  queue)
- When calculating cost of EQ_REF or REF, we added the cost of
  comparing the WHERE clause with the found rows, not all row
  combinations. This made ref and eq_ref to be regarded way to cheap
  compared to other access methods.
- FORCE INDEX cost calculation didn't take into account clustered or
  covered indexes.
- JT_EQ_REF cost was estimated as avg_io_cost(), which is half the
  cost of a JT_REF key. This may be true for InnoDB primary key, but
  not for other unique keys or other engines. Now we use handler
  function to calculate the cost, which allows us to handle
  consistently clustered, covered keys and not covered keys.
- ha_start_keyread() didn't call extra_opt() if keyread was already
  enabled but still changed the 'keyread' variable (which is wrong).
  Fixed by not doing anything if keyread is already enabled.
- multi_range_read_info_cost() didn't take into account io_cost when
  calculating the cost of ranges.
- fix_semijoin_strategies_for_picked_join_order() used the wrong
  record_count when calling best_access_path() for SJ_OPT_FIRST_MATCH
  and SJ_OPT_LOOSE_SCAN.
- Hash joins didn't provide correct best_cost to the upper level, which
  means that the cost for hash_joins more expensive than calculated
  in best_access_path (a difference of 10x * TIME_OF_COMPARE).
  This is fixed in the new code thanks to that we now include
  TIME_OF_COMPARE cost in 'read_time'.

Other things:
- Added some 'if (thd->trace_started())' to speed up code
- Removed not used function Cost_estimate::is_zero()
- Simplified testing of HA_POS_ERROR in get_best_ror_intersect().
  (No cost changes)
- Moved ha_start_keyread() from join_read_const_table() to join_read_const()
  to enable keyread for all types of JT_CONST tables.
- Made a few very short functions inline in handler.h

Notes:
- In main.rowid_filter the join order of order and lineitem is swapped.
  This is because the cost of doing a range fetch of lineitem(98 rows) is
  almost as big as the whole join of order,lineitem. The filtering will
  also ensure that we only have to do very small key fetches of the rows
  in lineitem.
- main.index_merge_myisam had a few changes where we are now using
  less keys for index_merge. This is because index scans are now more
  expensive than before.
- handler->optimizer_cache_cost is updated in ha_external_lock().
  This ensures that it is up to date per statements.
  Not an optimal solution (for locked tables), but should be ok for now.
- 'DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a' does not take cost of
  filesort into consideration when table scan is chosen.
  (main.myisam_explain_non_select_all)
- perfschema.table_aggregate_global_* has changed because an update
  on a table with 1 row will now use table scan instead of key lookup.

TODO in upcomming commits:
- Fix selectivity calculation for ranges with and without filtering and
  when there is a ref access but scan is chosen.
  For this we have to store the lowest known value for
  'accepted_records' in the OPT_RANGE structure.
- Change that records_read does not include filtered rows.
- test_if_cheaper_ordering() needs to be updated to properly calculate
  costs. This will fix tests like main.order_by_innodb,
  main.single_delete_update
- Extend get_range_limit_read_cost() to take into considering
  cost_for_index_read() if there where no quick keys. This will reduce
  the computed cost for ORDER BY with LIMIT in some cases.
  (main.innodb_ext_key)
- Fix that we take into account selectivity when counting the number
  of rows we have to read when considering using a index table scan to
  resolve ORDER BY.
- Add new calculation for rnd_pos_time() where we take into account the
  benefit of reading multiple rows from the same page.

50 files changed, 3537 insertions, 3483 deletions

diff --git a/mysql-test/suite/compat/oracle/r/table_value_constr.result b/mysql-test/suite/compat/oracle/r/table_value_constr.result
index af071433d0f..c88dc245808 100644
--- a/mysql-test/suite/compat/oracle/r/table_value_constr.result
+++ b/mysql-test/suite/compat/oracle/r/table_value_constr.result
@@ -565,12 +565,12 @@ where t1.a=t2.a and st<3
 select * from t2;
 a	b	st
 1	1	1
-1	2	2
 1	1	2
-1	2	3
-1	2	3
 1	1	3
 1	1	3
+1	2	2
+1	2	3
+1	2	3
 # recursive CTE that uses VALUES structure(s) : computation of factorial (first 10 elements)
 with recursive fact(n,f) as
 (
diff --git a/mysql-test/suite/compat/oracle/t/table_value_constr.test b/mysql-test/suite/compat/oracle/t/table_value_constr.test
index ca3c40bb7f9..7c1463e27af 100644
--- a/mysql-test/suite/compat/oracle/t/table_value_constr.test
+++ b/mysql-test/suite/compat/oracle/t/table_value_constr.test
@@ -424,6 +424,7 @@ select * from t2;
 
 --echo # recursive CTE that uses VALUES structure(s) : that uses UNION ALL
 
+--sorted_result
 with recursive t2(a,b,st) as
 (
   values(1,1,1)
diff --git a/mysql-test/suite/gcol/inc/gcol_keys.inc b/mysql-test/suite/gcol/inc/gcol_keys.inc
index e5ac0afd92a..9996d23e42e 100644
--- a/mysql-test/suite/gcol/inc/gcol_keys.inc
+++ b/mysql-test/suite/gcol/inc/gcol_keys.inc
@@ -14,6 +14,8 @@
 # Change:                                                                      #
 ################################################################################
 
+--source include/have_sequence.inc
+
 if (!$support_virtual_index) {
   let $skip_spatial_index_check=1;
   let $skip_foreign_key_check=1;
@@ -197,12 +199,16 @@ PRIMARY KEY (pk),
 KEY (col_time_key),
 KEY (col_datetime_key));
 
+--disable_warnings
 INSERT INTO c ( col_time_nokey,col_datetime_nokey,col_varchar_nokey) values
 ('14:03:03.042673','2001-11-28 00:50:27.051028', 'c'),
 ('01:46:09.016386','2007-10-09 19:53:04.008332', NULL),
 ('16:21:18.052408','2001-11-08 21:02:12.009395', 'x'),
 ('18:56:33.027423','2003-04-01 00:00:00', 'i');
 
+insert into c (col_time_nokey,col_datetime_nokey,col_varchar_nokey) select '10:10:10', '2021-12-24 01:50:27', 'z' from seq_1_to_10;
+--enable_warnings
+
 --replace_column 9 x 10 x
 EXPLAIN SELECT
 outr.col_time_key AS x
diff --git a/mysql-test/suite/gcol/inc/gcol_select.inc b/mysql-test/suite/gcol/inc/gcol_select.inc
index 2386c55fdbc..4c030cb5646 100644
--- a/mysql-test/suite/gcol/inc/gcol_select.inc
+++ b/mysql-test/suite/gcol/inc/gcol_select.inc
@@ -545,11 +545,11 @@ CREATE TABLE cc (
 );
 INSERT INTO cc (col_int_nokey) VALUES (0),(1),(7),(0),(4),(5);
 --replace_column 9 # 10 #
-EXPLAIN SELECT pk FROM cc WHERE col_int_key > 3;
-SELECT pk FROM cc WHERE col_int_key > 3;
+EXPLAIN SELECT pk FROM cc force index(col_int_key) WHERE col_int_key > 3;
+SELECT pk FROM cc force index(col_int_key) WHERE col_int_key > 3;
 --replace_column 9 # 10 #
-EXPLAIN SELECT pk FROM cc WHERE col_int_key > 3 ORDER BY 1;
-SELECT pk FROM cc WHERE col_int_key > 3 ORDER BY 1;
+EXPLAIN SELECT pk FROM cc force index(col_int_key) WHERE col_int_key > 3 ORDER BY 1;
+SELECT pk FROM cc force index(col_int_key) WHERE col_int_key > 3 ORDER BY 1;
 DROP TABLE cc;
 
 --echo #
diff --git a/mysql-test/suite/gcol/r/gcol_keys_innodb.result b/mysql-test/suite/gcol/r/gcol_keys_innodb.result
index 0228f9be842..4b1e5b48327 100644
--- a/mysql-test/suite/gcol/r/gcol_keys_innodb.result
+++ b/mysql-test/suite/gcol/r/gcol_keys_innodb.result
@@ -192,11 +192,7 @@ INSERT INTO c ( col_time_nokey,col_datetime_nokey,col_varchar_nokey) values
 ('01:46:09.016386','2007-10-09 19:53:04.008332', NULL),
 ('16:21:18.052408','2001-11-08 21:02:12.009395', 'x'),
 ('18:56:33.027423','2003-04-01 00:00:00', 'i');
-Warnings:
-Note	1265	Data truncated for column 'col_time_key' at row 1
-Note	1265	Data truncated for column 'col_time_key' at row 2
-Note	1265	Data truncated for column 'col_time_key' at row 3
-Note	1265	Data truncated for column 'col_time_key' at row 4
+insert into c (col_time_nokey,col_datetime_nokey,col_varchar_nokey) select '10:10:10', '2021-12-24 01:50:27', 'z' from seq_1_to_10;
 EXPLAIN SELECT
 outr.col_time_key AS x
 FROM c as outr
diff --git a/mysql-test/suite/gcol/r/gcol_keys_myisam.result b/mysql-test/suite/gcol/r/gcol_keys_myisam.result
index 523ff3a3764..3c9093cf9cd 100644
--- a/mysql-test/suite/gcol/r/gcol_keys_myisam.result
+++ b/mysql-test/suite/gcol/r/gcol_keys_myisam.result
@@ -192,11 +192,7 @@ INSERT INTO c ( col_time_nokey,col_datetime_nokey,col_varchar_nokey) values
 ('01:46:09.016386','2007-10-09 19:53:04.008332', NULL),
 ('16:21:18.052408','2001-11-08 21:02:12.009395', 'x'),
 ('18:56:33.027423','2003-04-01 00:00:00', 'i');
-Warnings:
-Note	1265	Data truncated for column 'col_time_key' at row 1
-Note	1265	Data truncated for column 'col_time_key' at row 2
-Note	1265	Data truncated for column 'col_time_key' at row 3
-Note	1265	Data truncated for column 'col_time_key' at row 4
+insert into c (col_time_nokey,col_datetime_nokey,col_varchar_nokey) select '10:10:10', '2021-12-24 01:50:27', 'z' from seq_1_to_10;
 EXPLAIN SELECT
 outr.col_time_key AS x
 FROM c as outr
diff --git a/mysql-test/suite/gcol/r/gcol_select_innodb.result b/mysql-test/suite/gcol/r/gcol_select_innodb.result
index 33673c33149..4bd1efd49cf 100644
--- a/mysql-test/suite/gcol/r/gcol_select_innodb.result
+++ b/mysql-test/suite/gcol/r/gcol_select_innodb.result
@@ -930,8 +930,8 @@ WHERE t4.c1 < 'o' and t4.i1 < (t2.i1 + 1)
 )
 AND t1.i1 <= t3.i2_key;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t4	ALL	NULL	NULL	NULL	NULL	3	Using where; Start temporary
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	4	Using join buffer (flat, BNL join)
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	4	
+1	PRIMARY	t4	ALL	NULL	NULL	NULL	NULL	3	Using where; Start temporary; Using join buffer (flat, BNL join)
 1	PRIMARY	t3	eq_ref	PRIMARY	PRIMARY	4	test.t4.i1	1	Using where
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	5	Using where; End temporary; Using join buffer (flat, BNL join)
 SELECT /*+ NO_SEMIJOIN(@subq1) */ t1.c1, t2.i1
diff --git a/mysql-test/suite/gcol/r/gcol_select_myisam.result b/mysql-test/suite/gcol/r/gcol_select_myisam.result
index 10a0ff275e7..e368094b20b 100644
--- a/mysql-test/suite/gcol/r/gcol_select_myisam.result
+++ b/mysql-test/suite/gcol/r/gcol_select_myisam.result
@@ -792,18 +792,18 @@ PRIMARY KEY (pk),
 KEY (col_int_key)
 );
 INSERT INTO cc (col_int_nokey) VALUES (0),(1),(7),(0),(4),(5);
-EXPLAIN SELECT pk FROM cc WHERE col_int_key > 3;
+EXPLAIN SELECT pk FROM cc force index(col_int_key) WHERE col_int_key > 3;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	cc	range	col_int_key	col_int_key	5	NULL	#	#
-SELECT pk FROM cc WHERE col_int_key > 3;
+SELECT pk FROM cc force index(col_int_key) WHERE col_int_key > 3;
 pk
 5
 6
 3
-EXPLAIN SELECT pk FROM cc WHERE col_int_key > 3 ORDER BY 1;
+EXPLAIN SELECT pk FROM cc force index(col_int_key) WHERE col_int_key > 3 ORDER BY 1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	cc	range	col_int_key	col_int_key	5	NULL	#	#
-SELECT pk FROM cc WHERE col_int_key > 3 ORDER BY 1;
+SELECT pk FROM cc force index(col_int_key) WHERE col_int_key > 3 ORDER BY 1;
 pk
 3
 5
@@ -1562,8 +1562,8 @@ WHERE t4.c1 < 'o' and t4.i1 < (t2.i1 + 1)
 )
 AND t1.i1 <= t3.i2_key;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t4	ALL	NULL	NULL	NULL	NULL	3	Using where; Start temporary
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	4	Using join buffer (flat, BNL join)
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	4	
+1	PRIMARY	t4	ALL	NULL	NULL	NULL	NULL	3	Using where; Start temporary; Using join buffer (flat, BNL join)
 1	PRIMARY	t3	eq_ref	PRIMARY,v_idx	PRIMARY	4	test.t4.i1	1	Using where
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	5	Using where; End temporary; Using join buffer (flat, BNL join)
 SELECT /*+ NO_SEMIJOIN(@subq1) */ t1.c1, t2.i1
diff --git a/mysql-test/suite/heap/heap.result b/mysql-test/suite/heap/heap.result
index bef3913dcb1..904bf2b2c42 100644
--- a/mysql-test/suite/heap/heap.result
+++ b/mysql-test/suite/heap/heap.result
@@ -66,7 +66,7 @@ a
 alter table t1 engine=myisam;
 explain select * from t1 where a in (869751,736494,226312,802616);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	uniq_id	uniq_id	4	NULL	4	Using where; Using index
+1	SIMPLE	t1	index	uniq_id	uniq_id	4	NULL	5	Using where; Using index
 drop table t1;
 create table t1 (x int not null, y int not null, key x (x), unique y (y))
 engine=heap;
diff --git a/mysql-test/suite/heap/heap_btree.result b/mysql-test/suite/heap/heap_btree.result
index 526c76a52e8..a534e25565a 100644
--- a/mysql-test/suite/heap/heap_btree.result
+++ b/mysql-test/suite/heap/heap_btree.result
@@ -69,6 +69,10 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 alter table t1 engine=myisam;
 explain select * from t1 where a in (869751,736494,226312,802616);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	index	uniq_id	uniq_id	4	NULL	5	Using where; Using index
+insert into t1 values (1),(2),(3),(4),(5),(6);
+explain select * from t1 where a in (869751,736494,226312,802616);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	uniq_id	uniq_id	4	NULL	4	Using where; Using index
 drop table t1;
 create table t1 (x int not null, y int not null, key x  using BTREE (x,y), unique y  using BTREE (y))
diff --git a/mysql-test/suite/heap/heap_btree.test b/mysql-test/suite/heap/heap_btree.test
index d3fbe4cc0d2..e8f7c02c6f3 100644
--- a/mysql-test/suite/heap/heap_btree.test
+++ b/mysql-test/suite/heap/heap_btree.test
@@ -48,6 +48,8 @@ select * from t1 where a in (869751,736494,226312,802616);
 explain select * from t1 where a in (869751,736494,226312,802616);
 alter table t1 engine=myisam;
 explain select * from t1 where a in (869751,736494,226312,802616);
+insert into t1 values (1),(2),(3),(4),(5),(6);
+explain select * from t1 where a in (869751,736494,226312,802616);
 drop table t1;
 
 create table t1 (x int not null, y int not null, key x  using BTREE (x,y), unique y  using BTREE (y))
diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
index 742a822baa0..a36652bebbd 100644
--- a/mysql-test/suite/innodb/r/innodb.result
+++ b/mysql-test/suite/innodb/r/innodb.result
@@ -1367,14 +1367,28 @@ PRIMARY KEY  (`id`),
 KEY `id_version` (`id_version`)
 ) ENGINE=InnoDB;
 INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9");
+ANALYZE table t1,t2;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'description'
+test.t1	analyze	status	OK
+test.t2	analyze	status	Engine-independent statistics collected
+test.t2	analyze	status	OK
+explain SELECT t2.id, t1.`label` FROM t2 INNER JOIN
+(SELECT t1.id_object as id_object FROM t1 WHERE t1.`label` LIKE '%test%') AS lbl 
+ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	id_object	NULL	NULL	NULL	6	Using where
+1	SIMPLE	t2	eq_ref	PRIMARY	PRIMARY	4	test.t1.id_object	1	Using index
+1	SIMPLE	t1	ref	id_object	id_object	5	test.t1.id_object	1	
 SELECT t2.id, t1.`label` FROM t2 INNER JOIN
 (SELECT t1.id_object as id_object FROM t1 WHERE t1.`label` LIKE '%test%') AS lbl 
 ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
 id	label
-3382	Test
 102	Le Pekin (Test)
 1794	Test de resto
 1822	Test 3
+3382	Test
 3524	Societe Test
 3525	Fournisseur Test
 drop table t1,t2;
diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result
index d390b395d28..7dbbd9079b5 100644
--- a/mysql-test/suite/innodb/r/innodb_mysql.result
+++ b/mysql-test/suite/innodb/r/innodb_mysql.result
@@ -1312,13 +1312,13 @@ EXPLAIN SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;
 id	1
 select_type	SIMPLE
 table	t1
-type	range
+type	index
 possible_keys	bkey
-key	bkey
-key_len	5
+key	PRIMARY
+key_len	4
 ref	NULL
 rows	32
-Extra	Using where; Using index; Using filesort
+Extra	Using where
 SELECT * FROM t1 WHERE b BETWEEN 1 AND 2 ORDER BY a;
 a	b
 1	2
@@ -3290,8 +3290,8 @@ EXPLAIN
 SELECT t2.b FROM t1,t2 WHERE t1.a IN (SELECT 1 FROM t2);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	1	
-1	PRIMARY	t2	index	NULL	PRIMARY	4	NULL	1	Using index; Start temporary; Using join buffer (flat, BNL join)
-1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where; End temporary; Using join buffer (incremental, BNL join)
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	Using where; Using join buffer (flat, BNL join)
+1	PRIMARY	t2	index	NULL	PRIMARY	4	NULL	1	Using index; FirstMatch(t1); Using join buffer (incremental, BNL join)
 SELECT t2.b FROM t1,t2 WHERE t1.a IN (SELECT 1 FROM t2);
 b
 1
diff --git a/mysql-test/suite/innodb/r/mdev-14846.result b/mysql-test/suite/innodb/r/mdev-14846.result
index 219bd718feb..b41f6e6bf97 100644
--- a/mysql-test/suite/innodb/r/mdev-14846.result
+++ b/mysql-test/suite/innodb/r/mdev-14846.result
@@ -33,13 +33,25 @@ pk	f1	f2	f3
 SET DEBUG_SYNC='now SIGNAL default_dml';
 connection default;
 SET DEBUG_SYNC='now WAIT_FOR default_dml';
-UPDATE t3 AS alias1 LEFT JOIN t3 AS alias2 ON ( alias1.f1 <> alias1.f2 ) SET alias1.f3 = 59 WHERE ( EXISTS ( SELECT t1.f3 FROM t1 WHERE t1.f1 = alias1.f1 ) ) OR alias2.f1 = 'h';
+explain UPDATE t3 AS alias1 LEFT JOIN t3 AS alias2 ON ( alias1.f1 <> alias1.f2 ) SET alias1.f3 = 59 WHERE ( EXISTS ( SELECT t1.f3 FROM t1 IGNORE INDEX (f1) WHERE t1.f1 = alias1.f1 ) ) OR alias2.f1 = 'h';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	alias1	ALL	NULL	NULL	NULL	NULL	#	
+1	PRIMARY	alias2	ALL	NULL	NULL	NULL	NULL	#	Using where
+2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	#	Using where
+UPDATE t3 AS alias1 LEFT JOIN t3 AS alias2 ON ( alias1.f1 <> alias1.f2 ) SET alias1.f3 = 59 WHERE ( EXISTS ( SELECT t1.f3 FROM t1 IGNORE INDEX (f1) WHERE t1.f1 = alias1.f1 ) ) OR alias2.f1 = 'h';
 connect  con2,localhost,root,,test;
 set debug_sync='now WAIT_FOR default_dml';
 SET DEBUG_SYNC='now SIGNAL con1_dml2';
 disconnect con2;
 connection con1;
 SET DEBUG_SYNC='now WAIT_FOR con1_dml2';
+explain UPDATE v4, t1 SET t1.pk = 76 WHERE t1.f2 IN ( SELECT t2.f FROM t2 INNER JOIN t3 );
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	index	NULL	f1	12	NULL	#	Using index
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	#	
+1	PRIMARY	<subquery2>	eq_ref	distinct_key	distinct_key	13	func	#	
+2	MATERIALIZED	t3	ALL	NULL	NULL	NULL	NULL	#	
+2	MATERIALIZED	t2	ALL	NULL	NULL	NULL	NULL	#	
 UPDATE v4, t1 SET t1.pk = 76 WHERE t1.f2 IN ( SELECT t2.f FROM t2 INNER JOIN t3 );
 connection default;
 ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
diff --git a/mysql-test/suite/innodb/r/temporary_table.result b/mysql-test/suite/innodb/r/temporary_table.result
index ffcee726f0d..3800b0e6579 100644
--- a/mysql-test/suite/innodb/r/temporary_table.result
+++ b/mysql-test/suite/innodb/r/temporary_table.result
@@ -28,7 +28,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 alter table t1 add index sec_index(f);
 explain select * from t1 where f > 1.29999;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	sec_index	sec_index	5	NULL	3	Using index condition
+1	SIMPLE	t1	ALL	sec_index	NULL	NULL	NULL	5	Using where
 select * from t1 where f > 1.29999;
 i	f	c
 98	1.3	jaipur
diff --git a/mysql-test/suite/innodb/r/temporary_table_optimization.result b/mysql-test/suite/innodb/r/temporary_table_optimization.result
index e2e9131b09d..c559268d29a 100644
--- a/mysql-test/suite/innodb/r/temporary_table_optimization.result
+++ b/mysql-test/suite/innodb/r/temporary_table_optimization.result
@@ -128,7 +128,7 @@ ERROR 23000: Duplicate entry '2.5' for key 'sec_index'
 alter table t1 add index sec_index(t1_f);
 explain select * from t1 where t1_f >= 2.5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	range	sec_index	sec_index	5	NULL	3	Using index condition
+1	SIMPLE	t1	ALL	sec_index	NULL	NULL	NULL	4	Using where
 select * from t1 where t1_f >= 2.5;
 t1_i	t1_f
 2	2.5
diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
index 58e9899bd40..9211a51dcfc 100644
--- a/mysql-test/suite/innodb/t/innodb.test
+++ b/mysql-test/suite/innodb/t/innodb.test
@@ -1106,7 +1106,13 @@ CREATE TABLE t2 (
 ) ENGINE=InnoDB;
 
 INSERT INTO t2 VALUES("3524", "1"),("3525", "1"),("1794", "4"),("102", "5"),("1822", "6"),("3382", "9");
+# We have to analyze the tables to make the row count stable
+ANALYZE table t1,t2;
 
+explain SELECT t2.id, t1.`label` FROM t2 INNER JOIN
+(SELECT t1.id_object as id_object FROM t1 WHERE t1.`label` LIKE '%test%') AS lbl 
+ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
+--sorted_result
 SELECT t2.id, t1.`label` FROM t2 INNER JOIN
 (SELECT t1.id_object as id_object FROM t1 WHERE t1.`label` LIKE '%test%') AS lbl 
 ON (t2.id = lbl.id_object) INNER JOIN t1 ON (t2.id = t1.id_object);
diff --git a/mysql-test/suite/innodb/t/mdev-14846.test b/mysql-test/suite/innodb/t/mdev-14846.test
index adcefecd52f..079a066cec5 100644
--- a/mysql-test/suite/innodb/t/mdev-14846.test
+++ b/mysql-test/suite/innodb/t/mdev-14846.test
@@ -38,7 +38,9 @@ SET DEBUG_SYNC='now SIGNAL default_dml';
 
 --connection default
 SET DEBUG_SYNC='now WAIT_FOR default_dml';
---send UPDATE t3 AS alias1 LEFT JOIN t3 AS alias2 ON ( alias1.f1 <> alias1.f2 ) SET alias1.f3 = 59 WHERE ( EXISTS ( SELECT t1.f3 FROM t1 WHERE t1.f1 = alias1.f1 ) ) OR alias2.f1 = 'h'
+--replace_column 9 #
+explain UPDATE t3 AS alias1 LEFT JOIN t3 AS alias2 ON ( alias1.f1 <> alias1.f2 ) SET alias1.f3 = 59 WHERE ( EXISTS ( SELECT t1.f3 FROM t1 IGNORE INDEX (f1) WHERE t1.f1 = alias1.f1 ) ) OR alias2.f1 = 'h';
+--send UPDATE t3 AS alias1 LEFT JOIN t3 AS alias2 ON ( alias1.f1 <> alias1.f2 ) SET alias1.f3 = 59 WHERE ( EXISTS ( SELECT t1.f3 FROM t1 IGNORE INDEX (f1) WHERE t1.f1 = alias1.f1 ) ) OR alias2.f1 = 'h'
 # It holds the lock of all record in t3 and tries to acquire record lock for the table  t1.
 
 --connect (con2,localhost,root,,test)
@@ -52,6 +54,8 @@ disconnect con2;
 # Cleanup
 --connection con1
 SET DEBUG_SYNC='now WAIT_FOR con1_dml2';
+--replace_column 9 #
+explain UPDATE v4, t1 SET t1.pk = 76 WHERE t1.f2 IN ( SELECT t2.f FROM t2 INNER JOIN t3 );
 UPDATE v4, t1 SET t1.pk = 76 WHERE t1.f2 IN ( SELECT t2.f FROM t2 INNER JOIN t3 );
 # It holds the record lock on table t1 and tries to acquire record lock on t3.
 # leads to deadlock (con1 trx is waiting for default trx and vice versa)
diff --git a/mysql-test/suite/innodb_fts/r/fulltext_misc.result b/mysql-test/suite/innodb_fts/r/fulltext_misc.result
index c58cf5ba62c..a4b3faf2d42 100644
--- a/mysql-test/suite/innodb_fts/r/fulltext_misc.result
+++ b/mysql-test/suite/innodb_fts/r/fulltext_misc.result
@@ -9,8 +9,8 @@ WHERE 1 > ALL((SELECT 1 FROM t1 JOIN t1 a ON (MATCH(t1.f1) AGAINST (""))
 WHERE t1.f1 GROUP BY t1.f1));
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	index	NULL	f1_2	8	NULL	1	Using index
-2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 2	SUBQUERY	a	index	NULL	f1_2	8	NULL	1	Using index
+2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 PREPARE stmt FROM
 'EXPLAIN SELECT 1 FROM t1
  WHERE 1 > ALL((SELECT 1 FROM t1 RIGHT OUTER JOIN t1 a
@@ -19,13 +19,13 @@ PREPARE stmt FROM
 EXECUTE stmt;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	index	NULL	f1_2	8	NULL	1	Using index
-2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 2	SUBQUERY	a	index	NULL	f1_2	8	NULL	1	Using index
+2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 EXECUTE stmt;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	index	NULL	f1_2	8	NULL	1	Using index
-2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 2	SUBQUERY	a	index	NULL	f1_2	8	NULL	1	Using index
+2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 DEALLOCATE PREPARE stmt;
 PREPARE stmt FROM
 'EXPLAIN SELECT 1 FROM t1
@@ -35,13 +35,13 @@ PREPARE stmt FROM
 EXECUTE stmt;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	index	NULL	f1_2	8	NULL	1	Using index
-2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 2	SUBQUERY	a	index	NULL	f1_2	8	NULL	1	Using index
+2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 EXECUTE stmt;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	index	NULL	f1_2	8	NULL	1	Using index
-2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 2	SUBQUERY	a	index	NULL	f1_2	8	NULL	1	Using index
+2	SUBQUERY	t1	fulltext	f1_2,f1	f1	0		1	Using where
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1;
 drop table if exists t1;
diff --git a/mysql-test/suite/json/t/json_table.test b/mysql-test/suite/json/t/json_table.test
index 05db8f66a59..492be2d48bf 100644
--- a/mysql-test/suite/json/t/json_table.test
+++ b/mysql-test/suite/json/t/json_table.test
@@ -69,6 +69,7 @@ insert into t1 select * from t1;
 
 set @save_optimizer_switch=@@optimizer_switch;
 set optimizer_switch='firstmatch=off';
+--sorted_result
 select * from 
   json_table('[{"color": "blue", "price": 50},
                      {"color": "red", "price": 100}]',
diff --git a/mysql-test/suite/maria/icp.result b/mysql-test/suite/maria/icp.result
index 43ec6439144..259078fb1ad 100644
--- a/mysql-test/suite/maria/icp.result
+++ b/mysql-test/suite/maria/icp.result
@@ -431,8 +431,8 @@ SELECT * FROM t1
 WHERE pk IN (SELECT it.pk FROM t2 JOIN t2 AS it ON it.i=it.i WHERE it.pk-t1.i<10);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	#	Using where
+2	DEPENDENT SUBQUERY	t2	index	NULL	PRIMARY	4	NULL	#	Using index
 2	DEPENDENT SUBQUERY	it	eq_ref	PRIMARY	PRIMARY	4	func	#	Using index condition
-2	DEPENDENT SUBQUERY	t2	index	NULL	PRIMARY	4	NULL	#	Using index; Using join buffer (flat, BNL join)
 SELECT * FROM t1
 WHERE pk IN (SELECT it.pk FROM t2 JOIN t2 AS it ON it.i=it.i WHERE it.pk-t1.i<10);
 pk	i
diff --git a/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result b/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result
index 79100ca2b48..17edbc19e0e 100644
--- a/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result
+++ b/mysql-test/suite/optimizer_unfixed_bugs/r/bug45221.result
@@ -29,10 +29,10 @@ SELECT `int_key`
 FROM t2  
 WHERE `date_nokey`  < `datetime_nokey`  XOR OUTR .`date_nokey`  )   ;
 pk
-9
 2
 5
 6
+9
 SELECT `pk`  
 FROM t1  
 WHERE `pk`  IN (  
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 bc0367b83bf..2cead80faf3 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
@@ -200,23 +200,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -224,7 +224,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con1;
@@ -256,23 +256,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -280,7 +280,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -318,23 +318,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -342,7 +342,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con2;
@@ -415,23 +415,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -439,7 +439,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	0
 TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
@@ -482,23 +482,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -506,7 +506,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	0
 TABLE	test	t3	68
 connection con3;
@@ -591,23 +591,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -615,7 +615,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	0
 TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
@@ -663,23 +663,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -687,7 +687,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	0
 TABLE	test	t3	117
 connection con4;
@@ -784,23 +784,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -808,7 +808,7 @@ 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	87
+TABLE	test	t1	88
 TABLE	test	t2	0
 TABLE	test	t3	176
 connection con1;
@@ -857,23 +857,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -881,7 +881,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 connection default;
@@ -927,23 +927,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -951,7 +951,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 set global read_only=1;
@@ -997,23 +997,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1021,7 +1021,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con1;
@@ -1064,23 +1064,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1088,7 +1088,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con2;
@@ -1130,23 +1130,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1154,7 +1154,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con3;
@@ -1195,23 +1195,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1219,7 +1219,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con4;
@@ -1259,23 +1259,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1283,7 +1283,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 connection default;
@@ -1325,23 +1325,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1349,7 +1349,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1390,23 +1390,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1414,7 +1414,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1455,23 +1455,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1479,7 +1479,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1520,23 +1520,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1544,7 +1544,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 1be707c48ed..0731bd1c219 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
@@ -209,16 +209,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -229,7 +229,7 @@ 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	t1	9	6	3	6	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;
@@ -239,7 +239,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con1;
@@ -271,16 +271,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -291,7 +291,7 @@ 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	t1	9	6	3	6	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;
@@ -301,7 +301,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -339,16 +339,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -359,7 +359,7 @@ 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	t1	9	6	3	6	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;
@@ -369,7 +369,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con2;
@@ -442,16 +442,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -462,7 +462,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -472,7 +472,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	50
 TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
@@ -515,16 +515,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -535,7 +535,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -545,7 +545,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	50
 TABLE	test	t3	68
 connection con3;
@@ -630,16 +630,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -650,7 +650,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -660,7 +660,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	84
 TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
@@ -708,16 +708,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -728,7 +728,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -738,7 +738,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	84
 TABLE	test	t3	117
 connection con4;
@@ -835,16 +835,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -855,7 +855,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -865,7 +865,7 @@ 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	87
+TABLE	test	t1	88
 TABLE	test	t2	124
 TABLE	test	t3	176
 connection con1;
@@ -914,16 +914,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -934,7 +934,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -944,7 +944,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 connection default;
@@ -990,16 +990,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1010,7 +1010,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1020,7 +1020,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 set global read_only=1;
@@ -1066,16 +1066,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1086,7 +1086,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1096,7 +1096,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con1;
@@ -1139,16 +1139,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1159,7 +1159,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1169,7 +1169,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con2;
@@ -1211,16 +1211,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1231,7 +1231,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1241,7 +1241,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con3;
@@ -1282,16 +1282,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1302,7 +1302,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1312,7 +1312,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con4;
@@ -1352,16 +1352,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1372,7 +1372,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1382,7 +1382,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 connection default;
@@ -1424,16 +1424,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1444,7 +1444,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1454,7 +1454,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1495,16 +1495,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1515,7 +1515,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1525,7 +1525,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1566,16 +1566,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1586,7 +1586,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1596,7 +1596,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1637,16 +1637,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1657,7 +1657,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1667,7 +1667,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 0ed76c7ef06..9c63dbcf285 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
@@ -200,23 +200,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -224,7 +224,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con1;
@@ -256,23 +256,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -280,7 +280,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -318,23 +318,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -342,7 +342,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con2;
@@ -415,23 +415,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -439,7 +439,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	0
 TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
@@ -482,23 +482,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -506,7 +506,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	0
 TABLE	test	t3	68
 connection con3;
@@ -591,23 +591,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -615,7 +615,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	0
 TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
@@ -663,23 +663,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -687,7 +687,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	0
 TABLE	test	t3	117
 connection con4;
@@ -784,23 +784,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -808,7 +808,7 @@ 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	87
+TABLE	test	t1	88
 TABLE	test	t2	0
 TABLE	test	t3	176
 connection con1;
@@ -857,23 +857,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -881,7 +881,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 connection default;
@@ -927,23 +927,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -951,7 +951,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 set global read_only=1;
@@ -997,23 +997,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1021,7 +1021,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con1;
@@ -1064,23 +1064,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1088,7 +1088,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con2;
@@ -1130,23 +1130,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1154,7 +1154,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con3;
@@ -1195,23 +1195,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1219,7 +1219,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con4;
@@ -1259,23 +1259,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1283,7 +1283,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 connection default;
@@ -1325,23 +1325,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1349,7 +1349,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1390,23 +1390,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1414,7 +1414,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1455,23 +1455,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1479,7 +1479,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1520,23 +1520,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1544,7 +1544,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 5d816b58777..58ea5ad88a0 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
@@ -209,16 +209,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -229,7 +229,7 @@ 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	t1	9	6	3	6	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;
@@ -239,7 +239,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con1;
@@ -271,16 +271,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -291,7 +291,7 @@ 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	t1	9	6	3	6	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;
@@ -301,7 +301,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -339,16 +339,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -359,7 +359,7 @@ 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	t1	9	6	3	6	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;
@@ -369,7 +369,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con2;
@@ -442,16 +442,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -462,7 +462,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -472,7 +472,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	50
 TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
@@ -515,16 +515,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -535,7 +535,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -545,7 +545,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	50
 TABLE	test	t3	68
 connection con3;
@@ -630,16 +630,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -650,7 +650,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -660,7 +660,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	84
 TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
@@ -708,16 +708,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -728,7 +728,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -738,7 +738,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	84
 TABLE	test	t3	117
 connection con4;
@@ -835,16 +835,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -855,7 +855,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -865,7 +865,7 @@ 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	87
+TABLE	test	t1	88
 TABLE	test	t2	124
 TABLE	test	t3	176
 connection con1;
@@ -914,16 +914,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -934,7 +934,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -944,7 +944,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 connection default;
@@ -990,16 +990,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1010,7 +1010,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1020,7 +1020,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 set global read_only=1;
@@ -1066,16 +1066,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1086,7 +1086,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1096,7 +1096,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con1;
@@ -1139,16 +1139,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1159,7 +1159,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1169,7 +1169,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con2;
@@ -1211,16 +1211,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1231,7 +1231,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1241,7 +1241,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con3;
@@ -1282,16 +1282,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1302,7 +1302,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1312,7 +1312,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con4;
@@ -1352,16 +1352,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1372,7 +1372,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1382,7 +1382,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 connection default;
@@ -1424,16 +1424,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1444,7 +1444,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1454,7 +1454,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1495,16 +1495,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1515,7 +1515,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1525,7 +1525,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1566,16 +1566,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1586,7 +1586,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1596,7 +1596,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1637,16 +1637,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1657,7 +1657,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1667,7 +1667,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 52ece6d289d..b1b8707988c 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
@@ -176,7 +176,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
@@ -186,39 +186,39 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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/io/table/sql/handler	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -226,7 +226,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con1;
@@ -236,7 +236,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
@@ -246,39 +246,39 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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/io/table/sql/handler	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -286,7 +286,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -297,7 +297,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -308,43 +308,43 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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/io/table/sql/handler	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -352,7 +352,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con2;
@@ -398,7 +398,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -409,43 +409,43 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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/io/table/sql/handler	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -453,7 +453,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
@@ -464,7 +464,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -476,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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -484,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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -492,31 +492,31 @@ 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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/io/table/sql/handler	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -524,7 +524,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con3;
@@ -577,7 +577,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -589,7 +589,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -597,7 +597,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -605,31 +605,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -637,7 +637,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	0
 TABLE	test	t3	78
 connect  con4, localhost, user4, , ;
@@ -648,7 +648,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -661,7 +661,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -671,7 +671,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -681,31 +681,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -713,7 +713,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	0
 TABLE	test	t3	78
 connection con4;
@@ -773,7 +773,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -786,7 +786,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -796,7 +796,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -806,31 +806,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -838,7 +838,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	0
 TABLE	test	t3	78
 connection con1;
@@ -850,7 +850,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -863,7 +863,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -873,7 +873,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -883,31 +883,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -915,7 +915,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 connection default;
@@ -924,7 +924,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -937,7 +937,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -947,7 +947,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -957,31 +957,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -989,7 +989,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 set global read_only=1;
@@ -998,7 +998,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1011,7 +1011,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1021,7 +1021,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1031,31 +1031,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1063,7 +1063,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 disconnect con1;
@@ -1082,7 +1082,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1092,7 +1092,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1102,31 +1102,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1134,7 +1134,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 disconnect con2;
@@ -1152,7 +1152,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1162,7 +1162,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1172,31 +1172,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1204,7 +1204,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 disconnect con3;
@@ -1221,7 +1221,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1231,7 +1231,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1241,31 +1241,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1273,7 +1273,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 disconnect con4;
@@ -1289,7 +1289,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1299,7 +1299,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1309,31 +1309,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1341,7 +1341,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 connection default;
@@ -1359,7 +1359,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1369,7 +1369,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1379,31 +1379,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1411,7 +1411,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1438,7 +1438,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1448,31 +1448,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1480,7 +1480,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1517,31 +1517,31 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1549,7 +1549,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1590,27 +1590,27 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1618,7 +1618,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_global_by_event_name;
@@ -1663,7 +1663,7 @@ 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	50	TABLE	test	t3
 wait/lock/table/sql/handler	32	TABLE	test	t3
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 b0ea06f4254..6aa67f54b6a 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
@@ -185,7 +185,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
@@ -195,23 +195,23 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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/io/table/sql/handler	9	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
@@ -219,10 +219,10 @@ 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -233,7 +233,7 @@ 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	t1	9	6	3	6	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;
@@ -243,7 +243,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con1;
@@ -253,7 +253,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
@@ -263,23 +263,23 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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/io/table/sql/handler	9	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
@@ -287,10 +287,10 @@ 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -301,7 +301,7 @@ 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	t1	9	6	3	6	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;
@@ -311,7 +311,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -322,7 +322,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -333,27 +333,27 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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/io/table/sql/handler	9	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
@@ -361,10 +361,10 @@ 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -375,7 +375,7 @@ 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	t1	9	6	3	6	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;
@@ -385,7 +385,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con2;
@@ -431,7 +431,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -442,27 +442,27 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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/io/table/sql/handler	9	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
@@ -470,10 +470,10 @@ 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -484,7 +484,7 @@ 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	t1	9	6	3	6	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;
@@ -494,7 +494,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
@@ -505,7 +505,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -517,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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -525,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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -533,15 +533,15 @@ 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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/io/table/sql/handler	9	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
@@ -549,10 +549,10 @@ 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -563,7 +563,7 @@ 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	t1	9	6	3	6	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;
@@ -573,7 +573,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con3;
@@ -626,7 +626,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -638,7 +638,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -646,7 +646,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -654,15 +654,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	24	TABLE	test	t2
@@ -670,10 +670,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -684,7 +684,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -694,7 +694,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	56
 TABLE	test	t3	78
 connect  con4, localhost, user4, , ;
@@ -705,7 +705,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -718,7 +718,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -728,7 +728,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -738,15 +738,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	24	TABLE	test	t2
@@ -754,10 +754,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -768,7 +768,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -778,7 +778,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	56
 TABLE	test	t3	78
 connection con4;
@@ -838,7 +838,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -851,7 +851,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -861,7 +861,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -871,15 +871,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	24	TABLE	test	t2
@@ -887,10 +887,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -901,7 +901,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -911,7 +911,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	56
 TABLE	test	t3	78
 connection con1;
@@ -923,7 +923,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -936,7 +936,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -946,7 +946,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -956,15 +956,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -972,10 +972,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -986,7 +986,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -996,7 +996,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 connection default;
@@ -1005,7 +1005,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1018,7 +1018,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1028,7 +1028,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1038,15 +1038,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -1054,10 +1054,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1068,7 +1068,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1078,7 +1078,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 set global read_only=1;
@@ -1087,7 +1087,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1100,7 +1100,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1110,7 +1110,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1120,15 +1120,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -1136,10 +1136,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1150,7 +1150,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1160,7 +1160,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 disconnect con1;
@@ -1179,7 +1179,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1189,7 +1189,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1199,15 +1199,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -1215,10 +1215,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1229,7 +1229,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1239,7 +1239,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 disconnect con2;
@@ -1257,7 +1257,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1267,7 +1267,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1277,15 +1277,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -1293,10 +1293,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1307,7 +1307,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1317,7 +1317,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 disconnect con3;
@@ -1334,7 +1334,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1344,7 +1344,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1354,15 +1354,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -1370,10 +1370,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1384,7 +1384,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1394,7 +1394,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 disconnect con4;
@@ -1410,7 +1410,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1420,7 +1420,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1430,15 +1430,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -1446,10 +1446,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1460,7 +1460,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1470,7 +1470,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 connection default;
@@ -1488,7 +1488,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1498,7 +1498,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1508,15 +1508,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -1524,10 +1524,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1538,7 +1538,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1548,7 +1548,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1575,7 +1575,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1585,15 +1585,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -1601,10 +1601,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1615,7 +1615,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1625,7 +1625,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1662,15 +1662,15 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -1678,10 +1678,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1692,7 +1692,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1702,7 +1702,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1743,11 +1743,11 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
@@ -1755,10 +1755,10 @@ 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1769,7 +1769,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1779,7 +1779,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_global_by_event_name;
@@ -1824,7 +1824,7 @@ 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	TABLE	test	t1
 wait/lock/table/sql/handler	24	TABLE	test	t1
 wait/io/table/sql/handler	32	TABLE	test	t2
 wait/lock/table/sql/handler	28	TABLE	test	t2
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 0a6dea739e4..800e0bd9df7 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
@@ -176,7 +176,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
@@ -186,39 +186,39 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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/io/table/sql/handler	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -226,7 +226,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con1;
@@ -236,7 +236,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
@@ -246,39 +246,39 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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/io/table/sql/handler	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -286,7 +286,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -297,7 +297,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -308,43 +308,43 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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/io/table/sql/handler	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -352,7 +352,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con2;
@@ -398,7 +398,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -409,43 +409,43 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 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	58
+localhost	wait/io/table/sql/handler	59
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 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	18	TABLE	test	t1
+wait/io/table/sql/handler	19	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -453,7 +453,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	0
 TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
@@ -464,7 +464,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -476,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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -484,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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -492,31 +492,31 @@ 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	58
+localhost	wait/io/table/sql/handler	59
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 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	18	TABLE	test	t1
+wait/io/table/sql/handler	19	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -524,7 +524,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	0
 TABLE	test	t3	68
 connection con3;
@@ -577,7 +577,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -589,7 +589,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -597,7 +597,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -605,31 +605,31 @@ 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	106
+localhost	wait/io/table/sql/handler	107
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 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	31	TABLE	test	t1
+wait/io/table/sql/handler	32	TABLE	test	t1
 wait/lock/table/sql/handler	30	TABLE	test	t1
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -637,7 +637,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	0
 TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
@@ -648,7 +648,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -661,7 +661,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -671,7 +671,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -681,31 +681,31 @@ 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	106
+localhost	wait/io/table/sql/handler	107
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 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	31	TABLE	test	t1
+wait/io/table/sql/handler	32	TABLE	test	t1
 wait/lock/table/sql/handler	30	TABLE	test	t1
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -713,7 +713,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	0
 TABLE	test	t3	117
 connection con4;
@@ -773,7 +773,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -786,7 +786,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -796,7 +796,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -806,31 +806,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	96
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	40	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -838,7 +838,7 @@ 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	87
+TABLE	test	t1	88
 TABLE	test	t2	0
 TABLE	test	t3	176
 connection con1;
@@ -850,7 +850,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -863,7 +863,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -873,7 +873,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -883,31 +883,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -915,7 +915,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 connection default;
@@ -924,7 +924,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -937,7 +937,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -947,7 +947,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -957,31 +957,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -989,7 +989,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 set global read_only=1;
@@ -998,7 +998,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -1011,7 +1011,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1021,7 +1021,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1031,31 +1031,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1063,7 +1063,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con1;
@@ -1082,7 +1082,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1092,7 +1092,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1102,31 +1102,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1134,7 +1134,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con2;
@@ -1152,7 +1152,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1162,7 +1162,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1172,31 +1172,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1204,7 +1204,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con3;
@@ -1221,7 +1221,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1231,7 +1231,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1241,31 +1241,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1273,7 +1273,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con4;
@@ -1289,7 +1289,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1299,7 +1299,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1309,31 +1309,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1341,7 +1341,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 connection default;
@@ -1359,7 +1359,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1369,7 +1369,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1379,31 +1379,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1411,7 +1411,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1438,7 +1438,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1448,31 +1448,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1480,7 +1480,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1517,31 +1517,31 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1549,7 +1549,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1590,27 +1590,27 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1618,7 +1618,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
@@ -1663,7 +1663,7 @@ 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	120	TABLE	test	t3
 wait/lock/table/sql/handler	60	TABLE	test	t3
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 c2eda2b8f23..349fa5ae5eb 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
@@ -185,7 +185,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
@@ -195,23 +195,23 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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/io/table/sql/handler	9	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
@@ -219,10 +219,10 @@ 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -233,7 +233,7 @@ 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	t1	9	6	3	6	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;
@@ -243,7 +243,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con1;
@@ -253,7 +253,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
@@ -263,23 +263,23 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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/io/table/sql/handler	9	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
@@ -287,10 +287,10 @@ 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -301,7 +301,7 @@ 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	t1	9	6	3	6	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;
@@ -311,7 +311,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -322,7 +322,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -333,27 +333,27 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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/io/table/sql/handler	9	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
@@ -361,10 +361,10 @@ 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -375,7 +375,7 @@ 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	t1	9	6	3	6	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;
@@ -385,7 +385,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con2;
@@ -431,7 +431,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -442,27 +442,27 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 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	84
+localhost	wait/io/table/sql/handler	85
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 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	18	TABLE	test	t1
+wait/io/table/sql/handler	19	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
 wait/io/table/sql/handler	26	TABLE	test	t2
 wait/lock/table/sql/handler	24	TABLE	test	t2
@@ -470,10 +470,10 @@ 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -484,7 +484,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -494,7 +494,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	50
 TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
@@ -505,7 +505,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -517,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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -525,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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -533,15 +533,15 @@ 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	84
+localhost	wait/io/table/sql/handler	85
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 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	18	TABLE	test	t1
+wait/io/table/sql/handler	19	TABLE	test	t1
 wait/lock/table/sql/handler	20	TABLE	test	t1
 wait/io/table/sql/handler	26	TABLE	test	t2
 wait/lock/table/sql/handler	24	TABLE	test	t2
@@ -549,10 +549,10 @@ 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -563,7 +563,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -573,7 +573,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	50
 TABLE	test	t3	68
 connection con3;
@@ -626,7 +626,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -638,7 +638,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -646,7 +646,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -654,15 +654,15 @@ 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	154
+localhost	wait/io/table/sql/handler	155
 localhost	wait/lock/table/sql/handler	108
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 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	31	TABLE	test	t1
+wait/io/table/sql/handler	32	TABLE	test	t1
 wait/lock/table/sql/handler	30	TABLE	test	t1
 wait/io/table/sql/handler	48	TABLE	test	t2
 wait/lock/table/sql/handler	36	TABLE	test	t2
@@ -670,10 +670,10 @@ 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -684,7 +684,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -694,7 +694,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	84
 TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
@@ -705,7 +705,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -718,7 +718,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -728,7 +728,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -738,15 +738,15 @@ 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	154
+localhost	wait/io/table/sql/handler	155
 localhost	wait/lock/table/sql/handler	108
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 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	31	TABLE	test	t1
+wait/io/table/sql/handler	32	TABLE	test	t1
 wait/lock/table/sql/handler	30	TABLE	test	t1
 wait/io/table/sql/handler	48	TABLE	test	t2
 wait/lock/table/sql/handler	36	TABLE	test	t2
@@ -754,10 +754,10 @@ 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -768,7 +768,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -778,7 +778,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	84
 TABLE	test	t3	117
 connection con4;
@@ -838,7 +838,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -851,7 +851,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -861,7 +861,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -871,15 +871,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	144
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	40	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	48	TABLE	test	t2
@@ -887,10 +887,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -901,7 +901,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -911,7 +911,7 @@ 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	87
+TABLE	test	t1	88
 TABLE	test	t2	124
 TABLE	test	t3	176
 connection con1;
@@ -923,7 +923,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -936,7 +936,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -946,7 +946,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -956,15 +956,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -972,10 +972,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -986,7 +986,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -996,7 +996,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 connection default;
@@ -1005,7 +1005,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1018,7 +1018,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1028,7 +1028,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1038,15 +1038,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -1054,10 +1054,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1068,7 +1068,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1078,7 +1078,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 set global read_only=1;
@@ -1087,7 +1087,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1100,7 +1100,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1110,7 +1110,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1120,15 +1120,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -1136,10 +1136,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1150,7 +1150,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1160,7 +1160,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con1;
@@ -1179,7 +1179,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1189,7 +1189,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1199,15 +1199,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -1215,10 +1215,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1229,7 +1229,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1239,7 +1239,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con2;
@@ -1257,7 +1257,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1267,7 +1267,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1277,15 +1277,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -1293,10 +1293,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1307,7 +1307,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1317,7 +1317,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con3;
@@ -1334,7 +1334,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1344,7 +1344,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1354,15 +1354,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -1370,10 +1370,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1384,7 +1384,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1394,7 +1394,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con4;
@@ -1410,7 +1410,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1420,7 +1420,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1430,15 +1430,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -1446,10 +1446,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1460,7 +1460,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1470,7 +1470,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 connection default;
@@ -1488,7 +1488,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1498,7 +1498,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1508,15 +1508,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -1524,10 +1524,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1538,7 +1538,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1548,7 +1548,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1575,7 +1575,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1585,15 +1585,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -1601,10 +1601,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1615,7 +1615,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1625,7 +1625,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1662,15 +1662,15 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -1678,10 +1678,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1692,7 +1692,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1702,7 +1702,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1743,11 +1743,11 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
@@ -1755,10 +1755,10 @@ 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1769,7 +1769,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1779,7 +1779,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
@@ -1824,7 +1824,7 @@ 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	TABLE	test	t1
 wait/lock/table/sql/handler	44	TABLE	test	t1
 wait/io/table/sql/handler	76	TABLE	test	t2
 wait/lock/table/sql/handler	52	TABLE	test	t2
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 eb4bdc0317e..b983c3480c6 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
@@ -178,7 +178,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
@@ -188,35 +188,35 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -224,7 +224,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con1;
@@ -234,7 +234,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
@@ -244,35 +244,35 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -280,7 +280,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -291,7 +291,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -302,39 +302,39 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -342,7 +342,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con2;
@@ -388,7 +388,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -399,39 +399,39 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -439,7 +439,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
@@ -450,7 +450,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -462,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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -470,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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -478,27 +478,27 @@ 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -506,7 +506,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con3;
@@ -559,7 +559,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -571,7 +571,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -579,7 +579,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -587,27 +587,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -615,7 +615,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	0
 TABLE	test	t3	78
 connect  con4, localhost, user4, , ;
@@ -626,7 +626,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -639,7 +639,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -649,7 +649,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -659,27 +659,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -687,7 +687,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	0
 TABLE	test	t3	78
 connection con4;
@@ -747,7 +747,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -760,7 +760,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -770,7 +770,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -780,27 +780,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -808,7 +808,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	0
 TABLE	test	t3	78
 connection con1;
@@ -820,7 +820,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -833,7 +833,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -843,7 +843,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -853,27 +853,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -881,7 +881,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 connection default;
@@ -890,7 +890,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -903,7 +903,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -913,7 +913,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -923,27 +923,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -951,7 +951,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 set global read_only=1;
@@ -960,7 +960,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -973,7 +973,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -983,7 +983,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -993,27 +993,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1021,7 +1021,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 disconnect con1;
@@ -1040,7 +1040,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1050,7 +1050,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1060,27 +1060,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1088,7 +1088,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 disconnect con2;
@@ -1106,7 +1106,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1116,7 +1116,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1126,27 +1126,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1154,7 +1154,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 disconnect con3;
@@ -1171,7 +1171,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1181,7 +1181,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1191,27 +1191,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1219,7 +1219,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 disconnect con4;
@@ -1235,7 +1235,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1245,7 +1245,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1255,27 +1255,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1283,7 +1283,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 connection default;
@@ -1301,7 +1301,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1311,7 +1311,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1321,27 +1321,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1349,7 +1349,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1376,7 +1376,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1386,27 +1386,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1414,7 +1414,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1451,27 +1451,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	56
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1479,7 +1479,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1520,23 +1520,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1544,7 +1544,7 @@ 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	45
+TABLE	test	t1	46
 TABLE	test	t2	0
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 3d993ada59f..646af510955 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
@@ -187,7 +187,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
@@ -197,28 +197,28 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -229,7 +229,7 @@ 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	t1	9	6	3	6	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;
@@ -239,7 +239,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con1;
@@ -249,7 +249,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
@@ -259,28 +259,28 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -291,7 +291,7 @@ 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	t1	9	6	3	6	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;
@@ -301,7 +301,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -312,7 +312,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -323,32 +323,32 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -359,7 +359,7 @@ 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	t1	9	6	3	6	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;
@@ -369,7 +369,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con2;
@@ -415,7 +415,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -426,32 +426,32 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -462,7 +462,7 @@ 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	t1	9	6	3	6	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;
@@ -472,7 +472,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connect  con3, localhost, user3, , ;
@@ -483,7 +483,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -495,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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -503,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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -511,20 +511,20 @@ 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -535,7 +535,7 @@ 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	t1	9	6	3	6	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;
@@ -545,7 +545,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con3;
@@ -598,7 +598,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -610,7 +610,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -618,7 +618,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -626,20 +626,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -650,7 +650,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -660,7 +660,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	56
 TABLE	test	t3	78
 connect  con4, localhost, user4, , ;
@@ -671,7 +671,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -684,7 +684,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -694,7 +694,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -704,20 +704,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -728,7 +728,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -738,7 +738,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	56
 TABLE	test	t3	78
 connection con4;
@@ -798,7 +798,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -811,7 +811,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -821,7 +821,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -831,20 +831,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -855,7 +855,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -865,7 +865,7 @@ 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	41
+TABLE	test	t1	42
 TABLE	test	t2	56
 TABLE	test	t3	78
 connection con1;
@@ -877,7 +877,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -890,7 +890,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -900,7 +900,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -910,20 +910,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -934,7 +934,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -944,7 +944,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 connection default;
@@ -953,7 +953,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -966,7 +966,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -976,7 +976,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -986,20 +986,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1010,7 +1010,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1020,7 +1020,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 set global read_only=1;
@@ -1029,7 +1029,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1042,7 +1042,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1052,7 +1052,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1062,20 +1062,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1086,7 +1086,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1096,7 +1096,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 disconnect con1;
@@ -1115,7 +1115,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1125,7 +1125,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1135,20 +1135,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1159,7 +1159,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1169,7 +1169,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 disconnect con2;
@@ -1187,7 +1187,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1197,7 +1197,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1207,20 +1207,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1231,7 +1231,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1241,7 +1241,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 disconnect con3;
@@ -1258,7 +1258,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1268,7 +1268,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1278,20 +1278,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1302,7 +1302,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1312,7 +1312,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 disconnect con4;
@@ -1328,7 +1328,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1338,7 +1338,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1348,20 +1348,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1372,7 +1372,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1382,7 +1382,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 connection default;
@@ -1400,7 +1400,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1410,7 +1410,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1420,20 +1420,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1444,7 +1444,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1454,7 +1454,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1481,7 +1481,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1491,20 +1491,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1515,7 +1515,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1525,7 +1525,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1562,20 +1562,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	84
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1586,7 +1586,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1596,7 +1596,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1637,16 +1637,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1657,7 +1657,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1667,7 +1667,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	45
+TABLE	test	t1	46
 TABLE	test	t2	60
 TABLE	test	t3	82
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 0c4f6592245..8f3ecffa856 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
@@ -178,7 +178,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
@@ -188,35 +188,35 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -224,7 +224,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con1;
@@ -234,7 +234,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	status
 user2	not found
@@ -244,35 +244,35 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -280,7 +280,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -291,7 +291,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -302,39 +302,39 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	24
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -342,7 +342,7 @@ 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	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	29
 connection con2;
@@ -388,7 +388,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -399,39 +399,39 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 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	58
+localhost	wait/io/table/sql/handler	59
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -439,7 +439,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	0
 TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
@@ -450,7 +450,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -462,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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -470,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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -478,27 +478,27 @@ 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	58
+localhost	wait/io/table/sql/handler	59
 localhost	wait/lock/table/sql/handler	48
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -506,7 +506,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	0
 TABLE	test	t3	68
 connection con3;
@@ -559,7 +559,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -571,7 +571,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -579,7 +579,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -587,27 +587,27 @@ 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	106
+localhost	wait/io/table/sql/handler	107
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -615,7 +615,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	0
 TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
@@ -626,7 +626,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -639,7 +639,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -649,7 +649,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -659,27 +659,27 @@ 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	106
+localhost	wait/io/table/sql/handler	107
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -687,7 +687,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	0
 TABLE	test	t3	117
 connection con4;
@@ -747,7 +747,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -760,7 +760,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	24
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -770,7 +770,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	24
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -780,27 +780,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	96
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -808,7 +808,7 @@ 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	87
+TABLE	test	t1	88
 TABLE	test	t2	0
 TABLE	test	t3	176
 connection con1;
@@ -820,7 +820,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -833,7 +833,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -843,7 +843,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -853,27 +853,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -881,7 +881,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 connection default;
@@ -890,7 +890,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -903,7 +903,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -913,7 +913,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -923,27 +923,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -951,7 +951,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 set global read_only=1;
@@ -960,7 +960,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -973,7 +973,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -983,7 +983,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -993,27 +993,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1021,7 +1021,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con1;
@@ -1040,7 +1040,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1050,7 +1050,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1060,27 +1060,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1088,7 +1088,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con2;
@@ -1106,7 +1106,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1116,7 +1116,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1126,27 +1126,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1154,7 +1154,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con3;
@@ -1171,7 +1171,7 @@ 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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1181,7 +1181,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1191,27 +1191,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1219,7 +1219,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 disconnect con4;
@@ -1235,7 +1235,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1245,7 +1245,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1255,27 +1255,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1283,7 +1283,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 connection default;
@@ -1301,7 +1301,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	32
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	24
@@ -1311,7 +1311,7 @@ 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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1321,27 +1321,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1349,7 +1349,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1376,7 +1376,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	32
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	24
@@ -1386,27 +1386,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1414,7 +1414,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1451,27 +1451,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	104
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1479,7 +1479,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1520,23 +1520,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1544,7 +1544,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	0
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 603e5950b12..972ef78d4a1 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
@@ -187,7 +187,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
@@ -197,28 +197,28 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -229,7 +229,7 @@ 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	t1	9	6	3	6	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;
@@ -239,7 +239,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con1;
@@ -249,7 +249,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	status
 user2	not found
@@ -259,28 +259,28 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -291,7 +291,7 @@ 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	t1	9	6	3	6	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;
@@ -301,7 +301,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connect  con2, localhost, user2, , ;
@@ -312,7 +312,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -323,32 +323,32 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	36
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -359,7 +359,7 @@ 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	t1	9	6	3	6	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;
@@ -369,7 +369,7 @@ 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	t1	19
 TABLE	test	t2	22
 TABLE	test	t3	29
 connection con2;
@@ -415,7 +415,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -426,32 +426,32 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 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	84
+localhost	wait/io/table/sql/handler	85
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -462,7 +462,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -472,7 +472,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	50
 TABLE	test	t3	68
 connect  con3, localhost, user3, , ;
@@ -483,7 +483,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -495,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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -503,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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -511,20 +511,20 @@ 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	84
+localhost	wait/io/table/sql/handler	85
 localhost	wait/lock/table/sql/handler	72
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -535,7 +535,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -545,7 +545,7 @@ 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	38
+TABLE	test	t1	39
 TABLE	test	t2	50
 TABLE	test	t3	68
 connection con3;
@@ -598,7 +598,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -610,7 +610,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -618,7 +618,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -626,20 +626,20 @@ 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	154
+localhost	wait/io/table/sql/handler	155
 localhost	wait/lock/table/sql/handler	108
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -650,7 +650,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -660,7 +660,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	84
 TABLE	test	t3	117
 connect  con4, localhost, user4, , ;
@@ -671,7 +671,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -684,7 +684,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -694,7 +694,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -704,20 +704,20 @@ 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	154
+localhost	wait/io/table/sql/handler	155
 localhost	wait/lock/table/sql/handler	108
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -728,7 +728,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -738,7 +738,7 @@ 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	61
+TABLE	test	t1	62
 TABLE	test	t2	84
 TABLE	test	t3	117
 connection con4;
@@ -798,7 +798,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -811,7 +811,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	36
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -821,7 +821,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	36
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -831,20 +831,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	144
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -855,7 +855,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -865,7 +865,7 @@ 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	87
+TABLE	test	t1	88
 TABLE	test	t2	124
 TABLE	test	t3	176
 connection con1;
@@ -877,7 +877,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -890,7 +890,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -900,7 +900,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -910,20 +910,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -934,7 +934,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -944,7 +944,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 connection default;
@@ -953,7 +953,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -966,7 +966,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -976,7 +976,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -986,20 +986,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1010,7 +1010,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1020,7 +1020,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 set global read_only=1;
@@ -1029,7 +1029,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1042,7 +1042,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1052,7 +1052,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1062,20 +1062,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1086,7 +1086,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1096,7 +1096,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con1;
@@ -1115,7 +1115,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1125,7 +1125,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1135,20 +1135,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1159,7 +1159,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1169,7 +1169,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con2;
@@ -1187,7 +1187,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1197,7 +1197,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1207,20 +1207,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1231,7 +1231,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1241,7 +1241,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con3;
@@ -1258,7 +1258,7 @@ 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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1268,7 +1268,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1278,20 +1278,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1302,7 +1302,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1312,7 +1312,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 disconnect con4;
@@ -1328,7 +1328,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1338,7 +1338,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1348,20 +1348,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1372,7 +1372,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1382,7 +1382,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 connection default;
@@ -1400,7 +1400,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	48
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	36
@@ -1410,7 +1410,7 @@ 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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1420,20 +1420,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1444,7 +1444,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1454,7 +1454,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1481,7 +1481,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	48
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	36
@@ -1491,20 +1491,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1515,7 +1515,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1525,7 +1525,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1562,20 +1562,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	156
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1586,7 +1586,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1596,7 +1596,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1637,16 +1637,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1657,7 +1657,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1667,7 +1667,7 @@ 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	91
+TABLE	test	t1	92
 TABLE	test	t2	128
 TABLE	test	t3	180
 truncate performance_schema.events_waits_summary_global_by_event_name;
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 abecba095bb..670325451ba 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
@@ -202,23 +202,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -226,7 +226,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con1;
@@ -258,23 +258,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -282,7 +282,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -320,23 +320,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -344,7 +344,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con2;
@@ -417,23 +417,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -441,7 +441,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
@@ -484,23 +484,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -508,7 +508,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	40
 connection con3;
@@ -593,23 +593,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -617,7 +617,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	0
 TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
@@ -665,23 +665,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -689,7 +689,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	0
 TABLE	test	t3	75
 connection con4;
@@ -786,23 +786,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -810,7 +810,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection con1;
@@ -859,23 +859,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -883,7 +883,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection default;
@@ -929,23 +929,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -953,7 +953,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 set global read_only=1;
@@ -999,23 +999,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1023,7 +1023,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con1;
@@ -1066,23 +1066,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1090,7 +1090,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con2;
@@ -1132,23 +1132,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1156,7 +1156,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con3;
@@ -1197,23 +1197,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1221,7 +1221,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con4;
@@ -1261,23 +1261,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1285,7 +1285,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection default;
@@ -1327,23 +1327,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1351,7 +1351,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1392,23 +1392,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1416,7 +1416,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1457,23 +1457,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1481,7 +1481,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1522,23 +1522,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1546,7 +1546,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result
index 6df4cad7899..5a261869ba0 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
@@ -211,16 +211,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -231,7 +231,7 @@ 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	t1	9	6	3	6	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;
@@ -241,7 +241,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con1;
@@ -273,16 +273,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -293,7 +293,7 @@ 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	t1	9	6	3	6	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;
@@ -303,7 +303,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -341,16 +341,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -361,7 +361,7 @@ 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	t1	9	6	3	6	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;
@@ -371,7 +371,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con2;
@@ -444,16 +444,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -464,7 +464,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -474,7 +474,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	26
 TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
@@ -517,16 +517,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -537,7 +537,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -547,7 +547,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	26
 TABLE	test	t3	40
 connection con3;
@@ -632,16 +632,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -652,7 +652,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -662,7 +662,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	48
 TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
@@ -710,16 +710,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -730,7 +730,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -740,7 +740,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	48
 TABLE	test	t3	75
 connection con4;
@@ -837,16 +837,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -857,7 +857,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -867,7 +867,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection con1;
@@ -916,16 +916,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -936,7 +936,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -946,7 +946,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection default;
@@ -992,16 +992,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1012,7 +1012,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1022,7 +1022,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 set global read_only=1;
@@ -1068,16 +1068,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1088,7 +1088,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1098,7 +1098,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con1;
@@ -1141,16 +1141,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1161,7 +1161,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1171,7 +1171,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con2;
@@ -1213,16 +1213,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1233,7 +1233,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1243,7 +1243,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con3;
@@ -1284,16 +1284,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1304,7 +1304,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1314,7 +1314,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con4;
@@ -1354,16 +1354,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1374,7 +1374,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1384,7 +1384,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection default;
@@ -1426,16 +1426,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1446,7 +1446,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1456,7 +1456,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1497,16 +1497,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1517,7 +1517,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1527,7 +1527,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1568,16 +1568,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1588,7 +1588,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1598,7 +1598,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1639,16 +1639,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1659,7 +1659,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1669,7 +1669,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result
index 47397d72d4a..20cf49db9fd 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
@@ -202,23 +202,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -226,7 +226,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con1;
@@ -258,23 +258,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -282,7 +282,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -320,23 +320,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -344,7 +344,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con2;
@@ -417,23 +417,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -441,7 +441,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
@@ -484,23 +484,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -508,7 +508,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	40
 connection con3;
@@ -593,23 +593,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -617,7 +617,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	0
 TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
@@ -665,23 +665,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -689,7 +689,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	0
 TABLE	test	t3	75
 connection con4;
@@ -786,23 +786,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -810,7 +810,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection con1;
@@ -859,23 +859,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -883,7 +883,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection default;
@@ -929,23 +929,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -953,7 +953,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 set global read_only=1;
@@ -999,23 +999,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1023,7 +1023,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con1;
@@ -1066,23 +1066,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1090,7 +1090,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con2;
@@ -1132,23 +1132,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1156,7 +1156,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con3;
@@ -1197,23 +1197,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1221,7 +1221,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con4;
@@ -1261,23 +1261,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1285,7 +1285,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection default;
@@ -1327,23 +1327,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1351,7 +1351,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1392,23 +1392,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1416,7 +1416,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1457,23 +1457,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1481,7 +1481,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1522,23 +1522,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1546,7 +1546,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result
index a697a1ae36d..59c9173e7cc 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
@@ -211,16 +211,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -231,7 +231,7 @@ 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	t1	9	6	3	6	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;
@@ -241,7 +241,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con1;
@@ -273,16 +273,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -293,7 +293,7 @@ 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	t1	9	6	3	6	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;
@@ -303,7 +303,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -341,16 +341,16 @@ localhost	wait/io/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/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -361,7 +361,7 @@ 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	t1	9	6	3	6	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;
@@ -371,7 +371,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con2;
@@ -444,16 +444,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -464,7 +464,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -474,7 +474,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	26
 TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
@@ -517,16 +517,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -537,7 +537,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -547,7 +547,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	26
 TABLE	test	t3	40
 connection con3;
@@ -632,16 +632,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -652,7 +652,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -662,7 +662,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	48
 TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
@@ -710,16 +710,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -730,7 +730,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -740,7 +740,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	48
 TABLE	test	t3	75
 connection con4;
@@ -837,16 +837,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -857,7 +857,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -867,7 +867,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection con1;
@@ -916,16 +916,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -936,7 +936,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -946,7 +946,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection default;
@@ -992,16 +992,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1012,7 +1012,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1022,7 +1022,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 set global read_only=1;
@@ -1068,16 +1068,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1088,7 +1088,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1098,7 +1098,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con1;
@@ -1141,16 +1141,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1161,7 +1161,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1171,7 +1171,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con2;
@@ -1213,16 +1213,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1233,7 +1233,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1243,7 +1243,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con3;
@@ -1284,16 +1284,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1304,7 +1304,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1314,7 +1314,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con4;
@@ -1354,16 +1354,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1374,7 +1374,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1384,7 +1384,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection default;
@@ -1426,16 +1426,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1446,7 +1446,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1456,7 +1456,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1497,16 +1497,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1517,7 +1517,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1527,7 +1527,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1568,16 +1568,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1588,7 +1588,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1598,7 +1598,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1639,16 +1639,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1659,7 +1659,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1669,7 +1669,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result
index 1b0ba5e2235..a6bbd488ceb 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
@@ -178,7 +178,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -188,37 +188,37 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -226,7 +226,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con1;
@@ -236,7 +236,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -246,37 +246,37 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -284,7 +284,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -295,7 +295,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -306,41 +306,41 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -348,7 +348,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con2;
@@ -394,7 +394,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -405,41 +405,41 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -447,7 +447,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connect  con3, localhost, user3, , ;
@@ -458,7 +458,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -470,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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -478,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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -486,29 +486,29 @@ 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -516,7 +516,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con3;
@@ -569,7 +569,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -581,7 +581,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -589,7 +589,7 @@ user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -597,29 +597,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -627,7 +627,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 connect  con4, localhost, user4, , ;
@@ -638,7 +638,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -651,7 +651,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -661,7 +661,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -671,29 +671,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -701,7 +701,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 connection con4;
@@ -761,7 +761,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -774,7 +774,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -784,7 +784,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -794,29 +794,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -824,7 +824,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 connection con1;
@@ -836,7 +836,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -849,7 +849,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -859,7 +859,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -869,29 +869,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -899,7 +899,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 connection default;
@@ -908,7 +908,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -921,7 +921,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -931,7 +931,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -941,29 +941,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -971,7 +971,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 set global read_only=1;
@@ -980,7 +980,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -993,7 +993,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1003,7 +1003,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1013,29 +1013,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1043,7 +1043,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 disconnect con1;
@@ -1062,7 +1062,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1072,7 +1072,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1082,29 +1082,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1112,7 +1112,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 disconnect con2;
@@ -1130,7 +1130,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1140,7 +1140,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1150,29 +1150,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1180,7 +1180,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 disconnect con3;
@@ -1197,7 +1197,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1207,7 +1207,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1217,29 +1217,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1247,7 +1247,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 disconnect con4;
@@ -1263,7 +1263,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1273,7 +1273,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1283,29 +1283,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1313,7 +1313,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 connection default;
@@ -1331,7 +1331,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1341,7 +1341,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1351,29 +1351,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1381,7 +1381,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1408,7 +1408,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1418,29 +1418,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1448,7 +1448,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1485,29 +1485,29 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1515,7 +1515,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1556,25 +1556,25 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1582,7 +1582,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_global_by_event_name;
@@ -1627,7 +1627,7 @@ 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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
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 b1813a1616e..78e3b720792 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
@@ -187,7 +187,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -197,31 +197,31 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -232,7 +232,7 @@ 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	t1	9	6	3	6	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;
@@ -242,7 +242,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con1;
@@ -252,7 +252,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -262,31 +262,31 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -297,7 +297,7 @@ 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	t1	9	6	3	6	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;
@@ -307,7 +307,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -318,7 +318,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -329,35 +329,35 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -368,7 +368,7 @@ 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	t1	9	6	3	6	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;
@@ -378,7 +378,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con2;
@@ -424,7 +424,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -435,35 +435,35 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -474,7 +474,7 @@ 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	t1	9	6	3	6	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;
@@ -484,7 +484,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connect  con3, localhost, user3, , ;
@@ -495,7 +495,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -507,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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -515,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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -523,23 +523,23 @@ 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -550,7 +550,7 @@ 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	t1	9	6	3	6	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;
@@ -560,7 +560,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con3;
@@ -613,7 +613,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -625,7 +625,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -633,7 +633,7 @@ user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -641,23 +641,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -668,7 +668,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -678,7 +678,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 connect  con4, localhost, user4, , ;
@@ -689,7 +689,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -702,7 +702,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -712,7 +712,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -722,23 +722,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -749,7 +749,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -759,7 +759,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 connection con4;
@@ -819,7 +819,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -832,7 +832,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -842,7 +842,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -852,23 +852,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -879,7 +879,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -889,7 +889,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 connection con1;
@@ -901,7 +901,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -914,7 +914,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -924,7 +924,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -934,23 +934,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -961,7 +961,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -971,7 +971,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 connection default;
@@ -980,7 +980,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -993,7 +993,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1003,7 +1003,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1013,23 +1013,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1040,7 +1040,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1050,7 +1050,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 set global read_only=1;
@@ -1059,7 +1059,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1072,7 +1072,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1082,7 +1082,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1092,23 +1092,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1119,7 +1119,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1129,7 +1129,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 disconnect con1;
@@ -1148,7 +1148,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1158,7 +1158,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1168,23 +1168,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1195,7 +1195,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1205,7 +1205,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 disconnect con2;
@@ -1223,7 +1223,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1233,7 +1233,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1243,23 +1243,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1270,7 +1270,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1280,7 +1280,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 disconnect con3;
@@ -1297,7 +1297,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1307,7 +1307,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1317,23 +1317,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1344,7 +1344,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1354,7 +1354,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 disconnect con4;
@@ -1370,7 +1370,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1380,7 +1380,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1390,23 +1390,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1417,7 +1417,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1427,7 +1427,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 connection default;
@@ -1445,7 +1445,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1455,7 +1455,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1465,23 +1465,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1492,7 +1492,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1502,7 +1502,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1529,7 +1529,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1539,23 +1539,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1566,7 +1566,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1576,7 +1576,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1613,23 +1613,23 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1640,7 +1640,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1650,7 +1650,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1691,19 +1691,19 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1714,7 +1714,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1724,7 +1724,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_global_by_event_name;
@@ -1769,7 +1769,7 @@ 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	21	TABLE	test	t1
+wait/io/table/sql/handler	22	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;
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 a19d3798e8b..e8b5fdaba5b 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
@@ -178,7 +178,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -188,37 +188,37 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -226,7 +226,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con1;
@@ -236,7 +236,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -246,37 +246,37 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -284,7 +284,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -295,7 +295,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -306,41 +306,41 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -348,7 +348,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con2;
@@ -394,7 +394,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -405,41 +405,41 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	58
+localhost	wait/io/table/sql/handler	59
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	19	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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -447,7 +447,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
@@ -458,7 +458,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -470,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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -478,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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -486,29 +486,29 @@ 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	58
+localhost	wait/io/table/sql/handler	59
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	19	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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -516,7 +516,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	40
 connection con3;
@@ -569,7 +569,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -581,7 +581,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -589,7 +589,7 @@ user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -597,29 +597,29 @@ 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	106
+localhost	wait/io/table/sql/handler	107
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	31	TABLE	test	t1
+wait/io/table/sql/handler	32	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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -627,7 +627,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	0
 TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
@@ -638,7 +638,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -651,7 +651,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -661,7 +661,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -671,29 +671,29 @@ 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	106
+localhost	wait/io/table/sql/handler	107
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	31	TABLE	test	t1
+wait/io/table/sql/handler	32	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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -701,7 +701,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	0
 TABLE	test	t3	75
 connection con4;
@@ -761,7 +761,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -774,7 +774,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -784,7 +784,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -794,29 +794,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -824,7 +824,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection con1;
@@ -836,7 +836,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -849,7 +849,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -859,7 +859,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -869,29 +869,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -899,7 +899,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection default;
@@ -908,7 +908,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -921,7 +921,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -931,7 +931,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -941,29 +941,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -971,7 +971,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 set global read_only=1;
@@ -980,7 +980,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -993,7 +993,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1003,7 +1003,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1013,29 +1013,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1043,7 +1043,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con1;
@@ -1062,7 +1062,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1072,7 +1072,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1082,29 +1082,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1112,7 +1112,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con2;
@@ -1130,7 +1130,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1140,7 +1140,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1150,29 +1150,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1180,7 +1180,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con3;
@@ -1197,7 +1197,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1207,7 +1207,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1217,29 +1217,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1247,7 +1247,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con4;
@@ -1263,7 +1263,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1273,7 +1273,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1283,29 +1283,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1313,7 +1313,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection default;
@@ -1331,7 +1331,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1341,7 +1341,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1351,29 +1351,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1381,7 +1381,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1408,7 +1408,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1418,29 +1418,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1448,7 +1448,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1485,29 +1485,29 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1515,7 +1515,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1556,25 +1556,25 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1582,7 +1582,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
@@ -1627,7 +1627,7 @@ 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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
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 6266fce73ad..b3fa01a0b14 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
@@ -187,7 +187,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -197,31 +197,31 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -232,7 +232,7 @@ 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	t1	9	6	3	6	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;
@@ -242,7 +242,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con1;
@@ -252,7 +252,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -262,31 +262,31 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -297,7 +297,7 @@ 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	t1	9	6	3	6	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;
@@ -307,7 +307,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -318,7 +318,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -329,35 +329,35 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/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	9	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -368,7 +368,7 @@ 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	t1	9	6	3	6	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;
@@ -378,7 +378,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con2;
@@ -424,7 +424,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -435,35 +435,35 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	84
+localhost	wait/io/table/sql/handler	85
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	19	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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -474,7 +474,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -484,7 +484,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	26
 TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
@@ -495,7 +495,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -507,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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -515,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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -523,23 +523,23 @@ 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	84
+localhost	wait/io/table/sql/handler	85
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	19	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	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -550,7 +550,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -560,7 +560,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	26
 TABLE	test	t3	40
 connection con3;
@@ -613,7 +613,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -625,7 +625,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -633,7 +633,7 @@ user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -641,23 +641,23 @@ 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	154
+localhost	wait/io/table/sql/handler	155
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	31	TABLE	test	t1
+wait/io/table/sql/handler	32	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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -668,7 +668,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -678,7 +678,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	48
 TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
@@ -689,7 +689,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -702,7 +702,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -712,7 +712,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -722,23 +722,23 @@ 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	154
+localhost	wait/io/table/sql/handler	155
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	31	TABLE	test	t1
+wait/io/table/sql/handler	32	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	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -749,7 +749,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -759,7 +759,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	48
 TABLE	test	t3	75
 connection con4;
@@ -819,7 +819,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -832,7 +832,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -842,7 +842,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -852,23 +852,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -879,7 +879,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -889,7 +889,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection con1;
@@ -901,7 +901,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -914,7 +914,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -924,7 +924,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -934,23 +934,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -961,7 +961,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -971,7 +971,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection default;
@@ -980,7 +980,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -993,7 +993,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1003,7 +1003,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1013,23 +1013,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1040,7 +1040,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1050,7 +1050,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 set global read_only=1;
@@ -1059,7 +1059,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1072,7 +1072,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1082,7 +1082,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1092,23 +1092,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1119,7 +1119,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1129,7 +1129,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con1;
@@ -1148,7 +1148,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1158,7 +1158,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1168,23 +1168,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1195,7 +1195,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1205,7 +1205,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con2;
@@ -1223,7 +1223,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1233,7 +1233,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1243,23 +1243,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1270,7 +1270,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1280,7 +1280,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con3;
@@ -1297,7 +1297,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1307,7 +1307,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1317,23 +1317,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1344,7 +1344,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1354,7 +1354,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con4;
@@ -1370,7 +1370,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1380,7 +1380,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1390,23 +1390,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1417,7 +1417,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1427,7 +1427,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection default;
@@ -1445,7 +1445,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1455,7 +1455,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1465,23 +1465,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1492,7 +1492,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1502,7 +1502,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1529,7 +1529,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1539,23 +1539,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1566,7 +1566,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1576,7 +1576,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1613,23 +1613,23 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1640,7 +1640,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1650,7 +1650,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1691,19 +1691,19 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/io/table/sql/handler	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1714,7 +1714,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1724,7 +1724,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
@@ -1769,7 +1769,7 @@ 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	47	TABLE	test	t1
+wait/io/table/sql/handler	48	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;
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 563793465c1..3791e0e7273 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
@@ -180,7 +180,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -190,35 +190,35 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -226,7 +226,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con1;
@@ -236,7 +236,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -246,35 +246,35 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -282,7 +282,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -293,7 +293,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -304,39 +304,39 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -344,7 +344,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con2;
@@ -390,7 +390,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -401,39 +401,39 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -441,7 +441,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connect  con3, localhost, user3, , ;
@@ -452,7 +452,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -464,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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -472,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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -480,27 +480,27 @@ 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -508,7 +508,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con3;
@@ -561,7 +561,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -573,7 +573,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -581,7 +581,7 @@ user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -589,27 +589,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -617,7 +617,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 connect  con4, localhost, user4, , ;
@@ -628,7 +628,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -641,7 +641,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -651,7 +651,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -661,27 +661,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -689,7 +689,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 connection con4;
@@ -749,7 +749,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -762,7 +762,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -772,7 +772,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -782,27 +782,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -810,7 +810,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 connection con1;
@@ -822,7 +822,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -835,7 +835,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -845,7 +845,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -855,27 +855,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -883,7 +883,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 connection default;
@@ -892,7 +892,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -905,7 +905,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -915,7 +915,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -925,27 +925,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -953,7 +953,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 set global read_only=1;
@@ -962,7 +962,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -975,7 +975,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -985,7 +985,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -995,27 +995,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1023,7 +1023,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 disconnect con1;
@@ -1042,7 +1042,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1052,7 +1052,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1062,27 +1062,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1090,7 +1090,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 disconnect con2;
@@ -1108,7 +1108,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1118,7 +1118,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1128,27 +1128,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1156,7 +1156,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 disconnect con3;
@@ -1173,7 +1173,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1183,7 +1183,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1193,27 +1193,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1221,7 +1221,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 disconnect con4;
@@ -1237,7 +1237,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1247,7 +1247,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1257,27 +1257,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1285,7 +1285,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 connection default;
@@ -1303,7 +1303,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1313,7 +1313,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1323,27 +1323,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1351,7 +1351,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1378,7 +1378,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1388,27 +1388,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1416,7 +1416,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1453,27 +1453,27 @@ 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	71
+localhost	wait/io/table/sql/handler	72
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1481,7 +1481,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1522,23 +1522,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	71
+wait/io/table/sql/handler	72
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	0
 TABLE	test	t3	NULL	44	26	18	26	6	12	0
 TABLE	test	t3	index_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	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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_low_priority	count_write_external
@@ -1546,7 +1546,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	0
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_global_by_event_name;
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result
index 8cf139c412c..54c9bf03bcd 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
@@ -189,7 +189,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -199,28 +199,28 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -231,7 +231,7 @@ 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	t1	9	6	3	6	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;
@@ -241,7 +241,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con1;
@@ -251,7 +251,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -261,28 +261,28 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -293,7 +293,7 @@ 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	t1	9	6	3	6	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;
@@ -303,7 +303,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -314,7 +314,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -325,32 +325,32 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -361,7 +361,7 @@ 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	t1	9	6	3	6	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;
@@ -371,7 +371,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con2;
@@ -417,7 +417,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -428,32 +428,32 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -464,7 +464,7 @@ 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	t1	9	6	3	6	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;
@@ -474,7 +474,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connect  con3, localhost, user3, , ;
@@ -485,7 +485,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -497,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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -505,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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -513,20 +513,20 @@ 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -537,7 +537,7 @@ 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	t1	9	6	3	6	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;
@@ -547,7 +547,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con3;
@@ -600,7 +600,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -612,7 +612,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -620,7 +620,7 @@ user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -628,20 +628,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -652,7 +652,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -662,7 +662,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 connect  con4, localhost, user4, , ;
@@ -673,7 +673,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -686,7 +686,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -696,7 +696,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -706,20 +706,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -730,7 +730,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -740,7 +740,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 connection con4;
@@ -800,7 +800,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -813,7 +813,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -823,7 +823,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -833,20 +833,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -857,7 +857,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -867,7 +867,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 connection con1;
@@ -879,7 +879,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -892,7 +892,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -902,7 +902,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -912,20 +912,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -936,7 +936,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -946,7 +946,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 connection default;
@@ -955,7 +955,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -968,7 +968,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -978,7 +978,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -988,20 +988,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1012,7 +1012,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1022,7 +1022,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 set global read_only=1;
@@ -1031,7 +1031,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -1044,7 +1044,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1054,7 +1054,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1064,20 +1064,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1088,7 +1088,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1098,7 +1098,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 disconnect con1;
@@ -1117,7 +1117,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1127,7 +1127,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1137,20 +1137,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1161,7 +1161,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1171,7 +1171,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 disconnect con2;
@@ -1189,7 +1189,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1199,7 +1199,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1209,20 +1209,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1233,7 +1233,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1243,7 +1243,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 disconnect con3;
@@ -1260,7 +1260,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1270,7 +1270,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1280,20 +1280,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1304,7 +1304,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1314,7 +1314,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 disconnect con4;
@@ -1330,7 +1330,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1340,7 +1340,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1350,20 +1350,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1374,7 +1374,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1384,7 +1384,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 connection default;
@@ -1402,7 +1402,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	0
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1412,7 +1412,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1422,20 +1422,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1446,7 +1446,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1456,7 +1456,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1483,7 +1483,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	0
 user2	wait/lock/table/sql/handler	0
@@ -1493,20 +1493,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1517,7 +1517,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1527,7 +1527,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1564,20 +1564,20 @@ 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	103
+localhost	wait/io/table/sql/handler	104
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1588,7 +1588,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1598,7 +1598,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1639,16 +1639,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	103
+wait/io/table/sql/handler	104
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	17	11	6	11	2	4	0
+TABLE	test	t1	NULL	20	13	7	13	2	5	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	4	2	2	2	0	2	0
+TABLE	test	t1	PRIMARY	2	1	1	1	0	1	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
@@ -1659,7 +1659,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	21	13	8	13	2	6	0
+TABLE	test	t1	22	14	8	14	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;
@@ -1669,7 +1669,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	21
+TABLE	test	t1	22
 TABLE	test	t2	32
 TABLE	test	t3	50
 truncate performance_schema.events_waits_summary_global_by_event_name;
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result
index 4f97cd6be4b..a1bde119be3 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
@@ -180,7 +180,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -190,35 +190,35 @@ 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -226,7 +226,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con1;
@@ -236,7 +236,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -246,35 +246,35 @@ username	status
 user4	not found
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 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/io/table/sql/handler	24
 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/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -282,7 +282,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -293,7 +293,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -304,39 +304,39 @@ 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/io/table/sql/handler	24
 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	23
+user1	wait/io/table/sql/handler	24
 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	23
+localhost	wait/io/table/sql/handler	24
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	23
+wait/io/table/sql/handler	24
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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	t1	9	6	3	6	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
@@ -344,7 +344,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	0
 TABLE	test	t3	15
 connection con2;
@@ -390,7 +390,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -401,39 +401,39 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	58
+localhost	wait/io/table/sql/handler	59
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -441,7 +441,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
@@ -452,7 +452,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -464,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	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -472,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	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -480,27 +480,27 @@ 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	58
+localhost	wait/io/table/sql/handler	59
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	58
+wait/io/table/sql/handler	59
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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_low_priority	count_write_external
@@ -508,7 +508,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	0
 TABLE	test	t3	40
 connection con3;
@@ -561,7 +561,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -573,7 +573,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -581,7 +581,7 @@ user3	localhost	wait/io/table/sql/handler	48
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -589,27 +589,27 @@ 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	106
+localhost	wait/io/table/sql/handler	107
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -617,7 +617,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	0
 TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
@@ -628,7 +628,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -641,7 +641,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -651,7 +651,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -661,27 +661,27 @@ 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	106
+localhost	wait/io/table/sql/handler	107
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	106
+wait/io/table/sql/handler	107
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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_low_priority	count_write_external
@@ -689,7 +689,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	0
 TABLE	test	t3	75
 connection con4;
@@ -749,7 +749,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -762,7 +762,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -772,7 +772,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -782,27 +782,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -810,7 +810,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection con1;
@@ -822,7 +822,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -835,7 +835,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -845,7 +845,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -855,27 +855,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -883,7 +883,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection default;
@@ -892,7 +892,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -905,7 +905,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -915,7 +915,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -925,27 +925,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -953,7 +953,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 set global read_only=1;
@@ -962,7 +962,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	35
@@ -975,7 +975,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -985,7 +985,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -995,27 +995,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1023,7 +1023,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con1;
@@ -1042,7 +1042,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1052,7 +1052,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1062,27 +1062,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1090,7 +1090,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con2;
@@ -1108,7 +1108,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1118,7 +1118,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1128,27 +1128,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1156,7 +1156,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con3;
@@ -1173,7 +1173,7 @@ user4	wait/io/table/sql/handler	61
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	23
+user1	localhost	wait/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1183,7 +1183,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1193,27 +1193,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1221,7 +1221,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 disconnect con4;
@@ -1237,7 +1237,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1247,7 +1247,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1257,27 +1257,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1285,7 +1285,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 connection default;
@@ -1303,7 +1303,7 @@ 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/io/table/sql/handler	24
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	35
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1313,7 +1313,7 @@ user4	localhost	wait/io/table/sql/handler	61
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1323,27 +1323,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1351,7 +1351,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1378,7 +1378,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	23
+user1	wait/io/table/sql/handler	24
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	35
 user2	wait/lock/table/sql/handler	0
@@ -1388,27 +1388,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1416,7 +1416,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1453,27 +1453,27 @@ 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	167
+localhost	wait/io/table/sql/handler	168
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1481,7 +1481,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1522,23 +1522,23 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	167
+wait/io/table/sql/handler	168
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t3	NULL	106	64	42	64	12	30	0
 TABLE	test	t3	index_b	10	10	0	10	0	0	0
 TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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_low_priority	count_write_external
@@ -1546,7 +1546,7 @@ TABLE	test	t1	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	0
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
diff --git a/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result b/mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result
index 7fed2e31955..f80b6da32cc 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
@@ -189,7 +189,7 @@ connection default;
 "================== Step 3-A =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -199,28 +199,28 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -231,7 +231,7 @@ 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	t1	9	6	3	6	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;
@@ -241,7 +241,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con1;
@@ -251,7 +251,7 @@ connection default;
 "================== Step 3-B =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	status
 user2	not found
@@ -261,28 +261,28 @@ 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 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/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -293,7 +293,7 @@ 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	t1	9	6	3	6	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;
@@ -303,7 +303,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connect  con2, localhost, user2, , ;
@@ -314,7 +314,7 @@ connection default;
 "================== Step 4 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	0
@@ -325,32 +325,32 @@ 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/io/table/sql/handler	34
 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	33
+user1	wait/io/table/sql/handler	34
 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	33
+localhost	wait/io/table/sql/handler	34
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	33
+wait/io/table/sql/handler	34
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	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	NULL	9	6	3	6	1	2	0
 TABLE	test	t1	index_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	t1	PRIMARY	0	0	0	0	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
@@ -361,7 +361,7 @@ 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	t1	9	6	3	6	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;
@@ -371,7 +371,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	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	t1	9
 TABLE	test	t2	10
 TABLE	test	t3	15
 connection con2;
@@ -417,7 +417,7 @@ connection default;
 "================== Step 5 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -428,32 +428,32 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
 execute dump_waits_host;
 host	event_name	count_star
-localhost	wait/io/table/sql/handler	84
+localhost	wait/io/table/sql/handler	85
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -464,7 +464,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -474,7 +474,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	26
 TABLE	test	t3	40
 connect  con3, localhost, user3, , ;
@@ -485,7 +485,7 @@ connection default;
 "================== Step 6 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -497,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	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -505,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	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -513,20 +513,20 @@ 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	84
+localhost	wait/io/table/sql/handler	85
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	84
+wait/io/table/sql/handler	85
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	14	9	5	9	2	3	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	t1	PRIMARY	2	1	1	1	0	1	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
@@ -537,7 +537,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	2	2	0	2	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	18	11	7	11	2	5	0
+TABLE	test	t1	19	12	7	12	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;
@@ -547,7 +547,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	18
+TABLE	test	t1	19
 TABLE	test	t2	26
 TABLE	test	t3	40
 connection con3;
@@ -600,7 +600,7 @@ connection default;
 "================== Step 7 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -612,7 +612,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -620,7 +620,7 @@ user3	localhost	wait/io/table/sql/handler	70
 user3	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -628,20 +628,20 @@ 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	154
+localhost	wait/io/table/sql/handler	155
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -652,7 +652,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -662,7 +662,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	48
 TABLE	test	t3	75
 connect  con4, localhost, user4, , ;
@@ -673,7 +673,7 @@ connection default;
 "================== Step 8 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -686,7 +686,7 @@ user4	wait/io/table/sql/handler	0
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -696,7 +696,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -706,20 +706,20 @@ 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	154
+localhost	wait/io/table/sql/handler	155
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	154
+wait/io/table/sql/handler	155
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	25	16	9	16	3	6	0
+TABLE	test	t1	NULL	28	18	10	18	3	7	0
 TABLE	test	t1	index_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	t1	PRIMARY	4	2	2	2	0	2	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
@@ -730,7 +730,7 @@ 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	31	19	12	19	3	9	0
+TABLE	test	t1	32	20	12	20	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;
@@ -740,7 +740,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	31
+TABLE	test	t1	32
 TABLE	test	t2	48
 TABLE	test	t3	75
 connection con4;
@@ -800,7 +800,7 @@ connection default;
 "================== Step 9 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -813,7 +813,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -823,7 +823,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -833,20 +833,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -857,7 +857,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -867,7 +867,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection con1;
@@ -879,7 +879,7 @@ connection default;
 "================== Step 10 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -892,7 +892,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -902,7 +902,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -912,20 +912,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -936,7 +936,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -946,7 +946,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection default;
@@ -955,7 +955,7 @@ flush tables;
 "================== Step 11 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -968,7 +968,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -978,7 +978,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -988,20 +988,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1012,7 +1012,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1022,7 +1022,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 set global read_only=1;
@@ -1031,7 +1031,7 @@ set global read_only=0;
 "================== Step 12 =================="
 call dump_thread();
 username	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 username	event_name	count_star
 user2	wait/io/table/sql/handler	51
@@ -1044,7 +1044,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1054,7 +1054,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1064,20 +1064,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1088,7 +1088,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1098,7 +1098,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con1;
@@ -1117,7 +1117,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1127,7 +1127,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1137,20 +1137,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1161,7 +1161,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1171,7 +1171,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con2;
@@ -1189,7 +1189,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1199,7 +1199,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1209,20 +1209,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1233,7 +1233,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1243,7 +1243,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con3;
@@ -1260,7 +1260,7 @@ user4	wait/io/table/sql/handler	89
 user4	wait/lock/table/sql/handler	0
 execute dump_waits_account;
 user	host	event_name	count_star
-user1	localhost	wait/io/table/sql/handler	33
+user1	localhost	wait/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1270,7 +1270,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1280,20 +1280,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1304,7 +1304,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1314,7 +1314,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 disconnect con4;
@@ -1330,7 +1330,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1340,7 +1340,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1350,20 +1350,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1374,7 +1374,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1384,7 +1384,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 connection default;
@@ -1402,7 +1402,7 @@ 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/io/table/sql/handler	34
 user1	localhost	wait/lock/table/sql/handler	0
 user2	localhost	wait/io/table/sql/handler	51
 user2	localhost	wait/lock/table/sql/handler	0
@@ -1412,7 +1412,7 @@ user4	localhost	wait/io/table/sql/handler	89
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1422,20 +1422,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1446,7 +1446,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1456,7 +1456,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_account_by_event_name;
@@ -1483,7 +1483,7 @@ user4	localhost	wait/io/table/sql/handler	0
 user4	localhost	wait/lock/table/sql/handler	0
 execute dump_waits_user;
 user	event_name	count_star
-user1	wait/io/table/sql/handler	33
+user1	wait/io/table/sql/handler	34
 user1	wait/lock/table/sql/handler	0
 user2	wait/io/table/sql/handler	51
 user2	wait/lock/table/sql/handler	0
@@ -1493,20 +1493,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1517,7 +1517,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1527,7 +1527,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_user_by_event_name;
@@ -1564,20 +1564,20 @@ 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	243
+localhost	wait/io/table/sql/handler	244
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1588,7 +1588,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1598,7 +1598,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_by_host_by_event_name;
@@ -1639,16 +1639,16 @@ localhost	wait/io/table/sql/handler	0
 localhost	wait/lock/table/sql/handler	0
 execute dump_waits_global;
 event_name	count_star
-wait/io/table/sql/handler	243
+wait/io/table/sql/handler	244
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	NULL	39	25	14	25	4	10	0
+TABLE	test	t1	NULL	42	27	15	27	4	11	0
 TABLE	test	t1	index_b	0	0	0	0	0	0	0
 TABLE	test	t1	index_cb	0	0	0	0	0	0	0
-TABLE	test	t1	PRIMARY	8	4	4	4	0	4	0
+TABLE	test	t1	PRIMARY	6	3	3	3	0	3	0
 TABLE	test	t2	NULL	72	44	28	44	8	20	0
 TABLE	test	t2	index_b	0	0	0	0	0	0	0
 TABLE	test	t2	index_cb	0	0	0	0	0	0	0
@@ -1659,7 +1659,7 @@ TABLE	test	t3	index_cb	0	0	0	0	0	0	0
 TABLE	test	t3	PRIMARY	4	4	0	4	0	0	0
 execute dump_waits_table_io;
 object_type	object_schema	object_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
-TABLE	test	t1	47	29	18	29	4	14	0
+TABLE	test	t1	48	30	18	30	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;
@@ -1669,7 +1669,7 @@ TABLE	test	t2	0	0	0	0	0	0	0	0	0	0
 TABLE	test	t3	0	0	0	0	0	0	0	0	0	0
 execute dump_objects_summary;
 object_type	object_schema	object_name	count_star
-TABLE	test	t1	47
+TABLE	test	t1	48
 TABLE	test	t2	76
 TABLE	test	t3	120
 truncate performance_schema.events_waits_summary_global_by_event_name;
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index e3328521395..294cf957d35 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -2462,6 +2462,16 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
+VARIABLE_NAME	OPTIMIZER_CACHE_HIT_RATIO
+VARIABLE_SCOPE	SESSION
+VARIABLE_TYPE	INT UNSIGNED
+VARIABLE_COMMENT	Expected hit rate of the row and index cache in storage engines. The value should be an integer between 0 and 99, where 0 means cache is empty and 99 means that value is almost always in the cache
+NUMERIC_MIN_VALUE	0
+NUMERIC_MAX_VALUE	99
+NUMERIC_BLOCK_SIZE	1
+ENUM_VALUE_LIST	NULL
+READ_ONLY	NO
+COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	OPTIMIZER_EXTRA_PRUNING_DEPTH
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
diff --git a/mysql-test/suite/sysschema/r/pr_statement_performance_analyzer.result b/mysql-test/suite/sysschema/r/pr_statement_performance_analyzer.result
index c7bb029da39..34dc57b2659 100644
--- a/mysql-test/suite/sysschema/r/pr_statement_performance_analyzer.result
+++ b/mysql-test/suite/sysschema/r/pr_statement_performance_analyzer.result
@@ -45,8 +45,8 @@ CALL sys.statement_performance_analyzer('delta', 'test.tmp_digests_ini', 'with_r
 CALL sys.statement_performance_analyzer('overall', NULL, 'analysis');
 Next Output
 QUERY_INSERT	test		2	0	0	LATENCY	LATENCY	LATENCY	LATENCY	0	0	0	0	2	1	0	0	0	0	DIGEST_INSERT	FIRST_SEEN	LAST_SEEN
-QUERY_SELECT	test	*	2	0	0	LATENCY	LATENCY	LATENCY	LATENCY	3	2	9	5	0	0	0	0	2	0	DIGEST_SELECT	FIRST_SEEN	LAST_SEEN
-QUERY_UPDATE	test		2	0	0	LATENCY	LATENCY	LATENCY	LATENCY	0	0	2	1	2	1	0	0	0	0	DIGEST_UPDATE	FIRST_SEEN	LAST_SEEN
+QUERY_SELECT	test	*	2	0	0	LATENCY	LATENCY	LATENCY	LATENCY	3	2	10	5	0	0	0	0	2	0	DIGEST_SELECT	FIRST_SEEN	LAST_SEEN
+QUERY_UPDATE	test	*	2	0	0	LATENCY	LATENCY	LATENCY	LATENCY	0	0	2	1	2	1	0	0	0	0	DIGEST_UPDATE	FIRST_SEEN	LAST_SEEN
 Top 100 Queries Ordered by Total Latency
 query	db	full_scan	exec_count	err_count	warn_count	total_latency	max_latency	avg_latency	lock_latency	rows_sent	rows_sent_avg	rows_examined	rows_examined_avg	rows_affected	rows_affected_avg	tmp_tables	tmp_disk_tables	rows_sorted	sort_merge_passes	digest	first_seen	last_seen
 CALL sys.statement_performance_analyzer('delta', 'test.tmp_digests_ini', 'analysis');
@@ -68,7 +68,8 @@ CALL sys.statement_performance_analyzer('overall', NULL, 'with_full_table_scans'
 Next Output
 Top 100 Queries with Full Table Scan
 query	db	exec_count	total_latency	no_index_used_count	no_good_index_used_count	no_index_used_pct	rows_sent	rows_examined	rows_sent_avg	rows_examined_avg	first_seen	last_seen	digest
-QUERY_SELECT	test	2	LATENCY	1	0	50	3	9	2	5	FIRST_SEEN	LAST_SEEN	DIGEST_SELECT
+QUERY_SELECT	test	2	LATENCY	2	0	100	3	10	2	5	FIRST_SEEN	LAST_SEEN	DIGEST_SELECT
+QUERY_UPDATE	test	2	LATENCY	1	0	50	0	2	0	1	FIRST_SEEN	LAST_SEEN	DIGEST_UPDATE
 CALL sys.statement_performance_analyzer('delta', 'test.tmp_digests_ini', 'with_full_table_scans');
 Next Output
 Top 100 Queries with Full Table Scan
diff --git a/mysql-test/suite/sysschema/t/pr_statement_performance_analyzer.test b/mysql-test/suite/sysschema/t/pr_statement_performance_analyzer.test
index b8932381e52..96b59a55e6d 100644
--- a/mysql-test/suite/sysschema/t/pr_statement_performance_analyzer.test
+++ b/mysql-test/suite/sysschema/t/pr_statement_performance_analyzer.test
@@ -155,9 +155,10 @@ CALL sys.statement_performance_analyzer('delta', 'test.tmp_digests_ini', 'analys
 CALL sys.statement_performance_analyzer('overall', NULL, 'with_errors_or_warnings');
 CALL sys.statement_performance_analyzer('delta', 'test.tmp_digests_ini', 'with_errors_or_warnings');
 
---replace_result $query_select QUERY_SELECT $digest_select DIGEST_SELECT $o_sel_total_latency LATENCY $o_sel_first_seen FIRST_SEEN $o_sel_last_seen LAST_SEEN
+--replace_column 4 LATENCY
+--replace_result $query_select QUERY_SELECT $digest_select DIGEST_SELECT $o_sel_first_seen FIRST_SEEN $o_sel_last_seen LAST_SEEN $digest_update DIGEST_UPDATE $query_update QUERY_UPDATE $o_upd_first_seen FIRST_SEEN $o_upd_last_seen LAST_SEEN
 CALL sys.statement_performance_analyzer('overall', NULL, 'with_full_table_scans');
---replace_result $query_select QUERY_SELECT $digest_select DIGEST_SELECT $d_sel_total_latency LATENCY $o_sel_first_seen FIRST_SEEN $o_sel_last_seen LAST_SEEN
+--replace_result $query_select QUERY_SELECT $digest_select DIGEST_SELECT $d_sel_total_latency LATENCY $o_sel_first_seen FIRST_SEEN $o_sel_last_seen LAST_SEEN 
 CALL sys.statement_performance_analyzer('delta', 'test.tmp_digests_ini', 'with_full_table_scans');
 
 --replace_result $query_select QUERY_SELECT $digest_select DIGEST_SELECT $o_sel_total_latency LATENCY $o_sel_first_seen FIRST_SEEN $o_sel_last_seen LAST_SEEN
diff --git a/mysql-test/suite/vcol/r/vcol_select_myisam.result b/mysql-test/suite/vcol/r/vcol_select_myisam.result
index 16e4e9f1ce1..fd32dcd6789 100644
--- a/mysql-test/suite/vcol/r/vcol_select_myisam.result
+++ b/mysql-test/suite/vcol/r/vcol_select_myisam.result
@@ -73,8 +73,8 @@ a	b	c
 1	-1	-1
 explain select * from t1 where c in (select c from t3 where c between -2 and -1);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t1	range	c	c	5	NULL	3	Using index condition
-1	PRIMARY	t3	eq_ref	c	c	5	test.t1.c	1	Using index
+1	PRIMARY	t3	range	c	c	5	NULL	2	Using where; Using index
+1	PRIMARY	t1	ALL	c	NULL	NULL	NULL	5	Using where; Using join buffer (flat, BNL join)
 # select_type=UNION, type=system
 # select_type=UNION RESULT, type=<union1,2>
 select * from t1 union select * from t2;