Revert "MDEV-29091: Correct event_name in PFS for wait caused by FOR UPDATE"

This reverts commit 03c9a4ef. The fix is wrong. It was doing this: if the uninitialized wait->m_class has some specific value, then don't initialize it.

Revert "MDEV-29091: Correct event_name in PFS for wait caused by FOR UPDATE"
This reverts commit 03c9a4ef. The fix is wrong. It was doing this: if the uninitialized wait->m_class has some specific value, then don't initialize it.
ea0b1ccd · Sergei Golubchik · c378efee · c378efee · ea0b1ccd · ea0b1ccd
Commit ea0b1ccd authored Oct 07, 2023 by Sergei Golubchik
7 changed files
--- a/mysql-test/suite/perfschema/r/events_waits_current_MDEV-29091.result
+++ b/mysql-test/suite/perfschema/r/events_waits_current_MDEV-29091.result
-SET default_storage_engine=InnoDB;
-SELECT @save_instrument_enabled := ENABLED
-, @save_instrument_timed := TIMED
-FROM performance_schema.setup_instruments
-WHERE NAME = 'wait/lock/table/sql/handler';
-@save_instrument_enabled := ENABLED	@save_instrument_timed := TIMED
-YES	YES
-SELECT @save_consumer_enabled := ENABLED
-FROM performance_schema.setup_consumers
-WHERE NAME = 'events_waits_current';
-@save_consumer_enabled := ENABLED
-YES
-UPDATE performance_schema.setup_instruments 
-SET ENABLED = 'YES', TIMED = 'YES'
-WHERE NAME = 'wait/lock/table/sql/handler';
-UPDATE performance_schema.setup_consumers 
-SET ENABLED = 'YES' 
-WHERE NAME = 'events_waits_current';
-CREATE TABLE t1 (id1 INT(11), col1 VARCHAR (200));
-INSERT INTO t1 VALUES (1, 'aa');
-INSERT INTO t1 VALUES (2, 'bb');
-connect  con1,localhost,root,,test;
-connect  con2,localhost,root,,test;
-connection con1;
-START TRANSACTION;
-connection con2;
-START TRANSACTION;
-SELECT id1 FROM t1 WHERE id1=1 FOR UPDATE;
-connection default;
-SELECT event_name FROM performance_schema.events_waits_current
-WHERE event_name LIKE '%wait/lock/table/sql/handler%';
-event_name
-UPDATE performance_schema.setup_instruments 
-SET ENABLED = @save_instrument_enabled, TIMED = @save_instrument_timed
-WHERE NAME = 'wait/lock/table/sql/handler';
-UPDATE performance_schema.setup_consumers 
-SET ENABLED = @save_consumer_enabled
-WHERE NAME = 'events_waits_current';
-disconnect con1;
-disconnect con2;
-DROP TABLE t1;
--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result
@@ -202,8 +202,10 @@ wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+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
@@ -260,8 +262,10 @@ wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+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
@@ -324,8 +328,10 @@ wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+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
@@ -423,8 +429,10 @@ wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+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
@@ -492,8 +500,10 @@ wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+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
@@ -603,8 +613,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	48
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	41	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	78	TABLE	test	t3
+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
@@ -677,8 +689,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	48
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	41	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	78	TABLE	test	t3
+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
@@ -800,8 +814,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	48
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	41	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	78	TABLE	test	t3
+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
@@ -875,8 +891,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -947,8 +965,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -1019,8 +1039,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -1088,8 +1110,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -1156,8 +1180,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -1223,8 +1249,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -1289,8 +1317,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -1357,8 +1387,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -1424,8 +1456,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -1491,8 +1525,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -1558,8 +1594,10 @@ wait/io/table/sql/handler	71
 wait/lock/table/sql/handler	56
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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
@@ -1625,8 +1663,10 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+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	0	0	0	0	0	0	0

--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result
@@ -211,9 +211,12 @@ wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t2
+wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+wait/io/table/sql/handler	10	TABLE	test	t2
+wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	15	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
@@ -276,9 +279,12 @@ wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t2
+wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+wait/io/table/sql/handler	10	TABLE	test	t2
+wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	15	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
@@ -347,9 +353,12 @@ wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t2
+wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+wait/io/table/sql/handler	10	TABLE	test	t2
+wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	15	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
@@ -453,9 +462,12 @@ wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t2
+wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+wait/io/table/sql/handler	10	TABLE	test	t2
+wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	15	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
@@ -529,9 +541,12 @@ wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t2
+wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+wait/io/table/sql/handler	10	TABLE	test	t2
+wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	15	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
@@ -647,9 +662,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	41	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	56	TABLE	test	t2
+wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	78	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -728,9 +746,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	41	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	56	TABLE	test	t2
+wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	78	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -858,9 +879,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	41	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	56	TABLE	test	t2
+wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	78	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -940,9 +964,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1019,9 +1046,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1098,9 +1128,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1174,9 +1207,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1249,9 +1285,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1323,9 +1362,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1396,9 +1438,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1471,9 +1516,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1545,9 +1593,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1619,9 +1670,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1693,9 +1747,12 @@ wait/io/table/sql/handler	103
 wait/lock/table/sql/handler	84
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1767,9 +1824,12 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	45	TABLE	test	t1
+wait/io/table/sql/handler	21	TABLE	test	t1
-wait/lock/table/sql/handler	60	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t1
-wait/lock/table/sql/handler	82	TABLE	test	t3
+wait/io/table/sql/handler	32	TABLE	test	t2
+wait/lock/table/sql/handler	28	TABLE	test	t2
+wait/io/table/sql/handler	50	TABLE	test	t3
+wait/lock/table/sql/handler	32	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	0	0	0	0	0	0	0

--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result
@@ -202,8 +202,10 @@ wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+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
@@ -260,8 +262,10 @@ wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+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
@@ -324,8 +328,10 @@ wait/io/table/sql/handler	23
 wait/lock/table/sql/handler	24
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+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
@@ -423,8 +429,10 @@ wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	48
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	38	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
-wait/lock/table/sql/handler	68	TABLE	test	t3
+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
@@ -492,8 +500,10 @@ wait/io/table/sql/handler	58
 wait/lock/table/sql/handler	48
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	38	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
-wait/lock/table/sql/handler	68	TABLE	test	t3
+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
@@ -603,8 +613,10 @@ wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	61	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
-wait/lock/table/sql/handler	117	TABLE	test	t3
+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
@@ -677,8 +689,10 @@ wait/io/table/sql/handler	106
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	61	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
-wait/lock/table/sql/handler	117	TABLE	test	t3
+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
@@ -800,8 +814,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	96
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	87	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	176	TABLE	test	t3
+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
@@ -875,8 +891,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -947,8 +965,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -1019,8 +1039,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -1088,8 +1110,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -1156,8 +1180,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -1223,8 +1249,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -1289,8 +1317,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -1357,8 +1387,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -1424,8 +1456,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -1491,8 +1525,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -1558,8 +1594,10 @@ wait/io/table/sql/handler	167
 wait/lock/table/sql/handler	104
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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
@@ -1625,8 +1663,10 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+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	0	0	0	0	0	0	0

--- a/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
+++ b/mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result
@@ -211,9 +211,12 @@ wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t2
+wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+wait/io/table/sql/handler	10	TABLE	test	t2
+wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	15	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
@@ -276,9 +279,12 @@ wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t2
+wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+wait/io/table/sql/handler	10	TABLE	test	t2
+wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	15	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
@@ -347,9 +353,12 @@ wait/io/table/sql/handler	33
 wait/lock/table/sql/handler	36
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	18	TABLE	test	t1
+wait/io/table/sql/handler	8	TABLE	test	t1
-wait/lock/table/sql/handler	22	TABLE	test	t2
+wait/lock/table/sql/handler	10	TABLE	test	t1
-wait/lock/table/sql/handler	29	TABLE	test	t3
+wait/io/table/sql/handler	10	TABLE	test	t2
+wait/lock/table/sql/handler	12	TABLE	test	t2
+wait/io/table/sql/handler	15	TABLE	test	t3
+wait/lock/table/sql/handler	14	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	6	4	2	4	1	1	0
@@ -453,9 +462,12 @@ wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	38	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
-wait/lock/table/sql/handler	50	TABLE	test	t2
+wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	68	TABLE	test	t3
+wait/io/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t2
+wait/io/table/sql/handler	40	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -529,9 +541,12 @@ wait/io/table/sql/handler	84
 wait/lock/table/sql/handler	72
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	38	TABLE	test	t1
+wait/io/table/sql/handler	18	TABLE	test	t1
-wait/lock/table/sql/handler	50	TABLE	test	t2
+wait/lock/table/sql/handler	20	TABLE	test	t1
-wait/lock/table/sql/handler	68	TABLE	test	t3
+wait/io/table/sql/handler	26	TABLE	test	t2
+wait/lock/table/sql/handler	24	TABLE	test	t2
+wait/io/table/sql/handler	40	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -647,9 +662,12 @@ wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	108
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	61	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
-wait/lock/table/sql/handler	84	TABLE	test	t2
+wait/lock/table/sql/handler	30	TABLE	test	t1
-wait/lock/table/sql/handler	117	TABLE	test	t3
+wait/io/table/sql/handler	48	TABLE	test	t2
+wait/lock/table/sql/handler	36	TABLE	test	t2
+wait/io/table/sql/handler	75	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -728,9 +746,12 @@ wait/io/table/sql/handler	154
 wait/lock/table/sql/handler	108
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	61	TABLE	test	t1
+wait/io/table/sql/handler	31	TABLE	test	t1
-wait/lock/table/sql/handler	84	TABLE	test	t2
+wait/lock/table/sql/handler	30	TABLE	test	t1
-wait/lock/table/sql/handler	117	TABLE	test	t3
+wait/io/table/sql/handler	48	TABLE	test	t2
+wait/lock/table/sql/handler	36	TABLE	test	t2
+wait/io/table/sql/handler	75	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -858,9 +879,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	144
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	87	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	124	TABLE	test	t2
+wait/lock/table/sql/handler	40	TABLE	test	t1
-wait/lock/table/sql/handler	176	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	48	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -940,9 +964,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1019,9 +1046,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1098,9 +1128,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1174,9 +1207,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1249,9 +1285,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1323,9 +1362,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1396,9 +1438,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1471,9 +1516,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1545,9 +1593,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1619,9 +1670,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1693,9 +1747,12 @@ wait/io/table/sql/handler	243
 wait/lock/table/sql/handler	156
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	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
@@ -1767,9 +1824,12 @@ wait/io/table/sql/handler	0
 wait/lock/table/sql/handler	0
 execute dump_waits_history;
 event_name	count(event_name)	object_type	object_schema	object_name
-wait/lock/table/sql/handler	91	TABLE	test	t1
+wait/io/table/sql/handler	47	TABLE	test	t1
-wait/lock/table/sql/handler	128	TABLE	test	t2
+wait/lock/table/sql/handler	44	TABLE	test	t1
-wait/lock/table/sql/handler	180	TABLE	test	t3
+wait/io/table/sql/handler	76	TABLE	test	t2
+wait/lock/table/sql/handler	52	TABLE	test	t2
+wait/io/table/sql/handler	120	TABLE	test	t3
+wait/lock/table/sql/handler	60	TABLE	test	t3
 execute dump_waits_index_io;
 object_type	object_schema	object_name	index_name	count_star	count_read	count_write	count_fetch	count_insert	count_update	count_delete
 TABLE	test	t1	NULL	0	0	0	0	0	0	0

--- a/mysql-test/suite/perfschema/t/events_waits_current_MDEV-29091.test
+++ b/mysql-test/suite/perfschema/t/events_waits_current_MDEV-29091.test
-#
-# proper event name wait/lock/table/sql/handler recorded in
-# PERFORMANCE_SCHEMA.EVENTS_WAITS_CURRENT. Before this fix, it was
-# labeled as wait/io/table/sql/handler.
-# 
--source include/have_innodb.inc
--source include/have_perfschema.inc
--source include/not_embedded.inc
-SET default_storage_engine=InnoDB;
-SELECT @save_instrument_enabled := ENABLED
-, @save_instrument_timed := TIMED
-FROM performance_schema.setup_instruments
-WHERE NAME = 'wait/lock/table/sql/handler';
-SELECT @save_consumer_enabled := ENABLED
-FROM performance_schema.setup_consumers
-WHERE NAME = 'events_waits_current';
-UPDATE performance_schema.setup_instruments 
-SET ENABLED = 'YES', TIMED = 'YES'
-WHERE NAME = 'wait/lock/table/sql/handler';
-UPDATE performance_schema.setup_consumers 
-SET ENABLED = 'YES' 
-WHERE NAME = 'events_waits_current';
-CREATE TABLE t1 (id1 INT(11), col1 VARCHAR (200));
-INSERT INTO t1 VALUES (1, 'aa');
-INSERT INTO t1 VALUES (2, 'bb');
-connect (con1,localhost,root,,test);
-connect (con2,localhost,root,,test);
-connection con1;
-START TRANSACTION;
-let $wait_condition=
-  SELECT id1 FROM t1 WHERE id1=1 FOR UPDATE;
--source include/wait_condition.inc
-connection con2;
-START TRANSACTION;
-send SELECT id1 FROM t1 WHERE id1=1 FOR UPDATE;
-connection default;
-SELECT event_name FROM performance_schema.events_waits_current
-WHERE event_name LIKE '%wait/lock/table/sql/handler%';
-# clean up
-UPDATE performance_schema.setup_instruments 
-SET ENABLED = @save_instrument_enabled, TIMED = @save_instrument_timed
-WHERE NAME = 'wait/lock/table/sql/handler';
-UPDATE performance_schema.setup_consumers 
-SET ENABLED = @save_consumer_enabled
-WHERE NAME = 'events_waits_current';
-disconnect con1;
-disconnect con2;
-DROP TABLE t1;
--- a/storage/perfschema/pfs.cc
+++ b/storage/perfschema/pfs.cc
@@ -3068,7 +3068,6 @@ pfs_start_table_io_wait_v1(PSI_table_locker_state *state,
      PFS_table_share *share= pfs_table->m_share;
      wait->m_thread_internal_id= pfs_thread->m_thread_internal_id;
-      if (wait->m_class == NULL || wait->m_class->m_type != PFS_CLASS_TABLE_LOCK)
      wait->m_class= &global_table_io_class;
      wait->m_timer_start= timer_start;
      wait->m_timer_end= 0;