Skip to content

Commit ea0b1cc

Browse files
vuvovavuvova
committed
Revert "MDEV-29091: Correct event_name in PFS for wait caused by FOR UPDATE"
This reverts commit 03c9a4e. The fix is wrong. It was doing this: if the uninitialized wait->m_class has some specific value, then don't initialize it.
1 parent c378efe commit ea0b1cc

7 files changed

+401
-305
lines changed

‎mysql-test/suite/perfschema/r/events_waits_current_MDEV-29091.result

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result

Lines changed: 80 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,10 @@ wait/io/table/sql/handler 23
202202
wait/lock/table/sql/handler 24
203203
execute dump_waits_history;
204204
event_name count(event_name) object_type object_schema object_name
205-
wait/lock/table/sql/handler 18 TABLE test t1
206-
wait/lock/table/sql/handler 29 TABLE test t3
205+
wait/io/table/sql/handler 8 TABLE test t1
206+
wait/lock/table/sql/handler 10 TABLE test t1
207+
wait/io/table/sql/handler 15 TABLE test t3
208+
wait/lock/table/sql/handler 14 TABLE test t3
207209
execute dump_waits_index_io;
208210
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
209211
TABLE test t1 NULL 6 4 2 4 1 1 0
@@ -260,8 +262,10 @@ wait/io/table/sql/handler 23
260262
wait/lock/table/sql/handler 24
261263
execute dump_waits_history;
262264
event_name count(event_name) object_type object_schema object_name
263-
wait/lock/table/sql/handler 18 TABLE test t1
264-
wait/lock/table/sql/handler 29 TABLE test t3
265+
wait/io/table/sql/handler 8 TABLE test t1
266+
wait/lock/table/sql/handler 10 TABLE test t1
267+
wait/io/table/sql/handler 15 TABLE test t3
268+
wait/lock/table/sql/handler 14 TABLE test t3
265269
execute dump_waits_index_io;
266270
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
267271
TABLE test t1 NULL 6 4 2 4 1 1 0
@@ -324,8 +328,10 @@ wait/io/table/sql/handler 23
324328
wait/lock/table/sql/handler 24
325329
execute dump_waits_history;
326330
event_name count(event_name) object_type object_schema object_name
327-
wait/lock/table/sql/handler 18 TABLE test t1
328-
wait/lock/table/sql/handler 29 TABLE test t3
331+
wait/io/table/sql/handler 8 TABLE test t1
332+
wait/lock/table/sql/handler 10 TABLE test t1
333+
wait/io/table/sql/handler 15 TABLE test t3
334+
wait/lock/table/sql/handler 14 TABLE test t3
329335
execute dump_waits_index_io;
330336
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
331337
TABLE test t1 NULL 6 4 2 4 1 1 0
@@ -423,8 +429,10 @@ wait/io/table/sql/handler 23
423429
wait/lock/table/sql/handler 24
424430
execute dump_waits_history;
425431
event_name count(event_name) object_type object_schema object_name
426-
wait/lock/table/sql/handler 18 TABLE test t1
427-
wait/lock/table/sql/handler 29 TABLE test t3
432+
wait/io/table/sql/handler 8 TABLE test t1
433+
wait/lock/table/sql/handler 10 TABLE test t1
434+
wait/io/table/sql/handler 15 TABLE test t3
435+
wait/lock/table/sql/handler 14 TABLE test t3
428436
execute dump_waits_index_io;
429437
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
430438
TABLE test t1 NULL 6 4 2 4 1 1 0
@@ -492,8 +500,10 @@ wait/io/table/sql/handler 23
492500
wait/lock/table/sql/handler 24
493501
execute dump_waits_history;
494502
event_name count(event_name) object_type object_schema object_name
495-
wait/lock/table/sql/handler 18 TABLE test t1
496-
wait/lock/table/sql/handler 29 TABLE test t3
503+
wait/io/table/sql/handler 8 TABLE test t1
504+
wait/lock/table/sql/handler 10 TABLE test t1
505+
wait/io/table/sql/handler 15 TABLE test t3
506+
wait/lock/table/sql/handler 14 TABLE test t3
497507
execute dump_waits_index_io;
498508
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
499509
TABLE test t1 NULL 6 4 2 4 1 1 0
@@ -603,8 +613,10 @@ wait/io/table/sql/handler 71
603613
wait/lock/table/sql/handler 48
604614
execute dump_waits_history;
605615
event_name count(event_name) object_type object_schema object_name
606-
wait/lock/table/sql/handler 41 TABLE test t1
607-
wait/lock/table/sql/handler 78 TABLE test t3
616+
wait/io/table/sql/handler 21 TABLE test t1
617+
wait/lock/table/sql/handler 20 TABLE test t1
618+
wait/io/table/sql/handler 50 TABLE test t3
619+
wait/lock/table/sql/handler 28 TABLE test t3
608620
execute dump_waits_index_io;
609621
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
610622
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -677,8 +689,10 @@ wait/io/table/sql/handler 71
677689
wait/lock/table/sql/handler 48
678690
execute dump_waits_history;
679691
event_name count(event_name) object_type object_schema object_name
680-
wait/lock/table/sql/handler 41 TABLE test t1
681-
wait/lock/table/sql/handler 78 TABLE test t3
692+
wait/io/table/sql/handler 21 TABLE test t1
693+
wait/lock/table/sql/handler 20 TABLE test t1
694+
wait/io/table/sql/handler 50 TABLE test t3
695+
wait/lock/table/sql/handler 28 TABLE test t3
682696
execute dump_waits_index_io;
683697
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
684698
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -800,8 +814,10 @@ wait/io/table/sql/handler 71
800814
wait/lock/table/sql/handler 48
801815
execute dump_waits_history;
802816
event_name count(event_name) object_type object_schema object_name
803-
wait/lock/table/sql/handler 41 TABLE test t1
804-
wait/lock/table/sql/handler 78 TABLE test t3
817+
wait/io/table/sql/handler 21 TABLE test t1
818+
wait/lock/table/sql/handler 20 TABLE test t1
819+
wait/io/table/sql/handler 50 TABLE test t3
820+
wait/lock/table/sql/handler 28 TABLE test t3
805821
execute dump_waits_index_io;
806822
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
807823
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -875,8 +891,10 @@ wait/io/table/sql/handler 71
875891
wait/lock/table/sql/handler 56
876892
execute dump_waits_history;
877893
event_name count(event_name) object_type object_schema object_name
878-
wait/lock/table/sql/handler 45 TABLE test t1
879-
wait/lock/table/sql/handler 82 TABLE test t3
894+
wait/io/table/sql/handler 21 TABLE test t1
895+
wait/lock/table/sql/handler 24 TABLE test t1
896+
wait/io/table/sql/handler 50 TABLE test t3
897+
wait/lock/table/sql/handler 32 TABLE test t3
880898
execute dump_waits_index_io;
881899
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
882900
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -947,8 +965,10 @@ wait/io/table/sql/handler 71
947965
wait/lock/table/sql/handler 56
948966
execute dump_waits_history;
949967
event_name count(event_name) object_type object_schema object_name
950-
wait/lock/table/sql/handler 45 TABLE test t1
951-
wait/lock/table/sql/handler 82 TABLE test t3
968+
wait/io/table/sql/handler 21 TABLE test t1
969+
wait/lock/table/sql/handler 24 TABLE test t1
970+
wait/io/table/sql/handler 50 TABLE test t3
971+
wait/lock/table/sql/handler 32 TABLE test t3
952972
execute dump_waits_index_io;
953973
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
954974
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -1019,8 +1039,10 @@ wait/io/table/sql/handler 71
10191039
wait/lock/table/sql/handler 56
10201040
execute dump_waits_history;
10211041
event_name count(event_name) object_type object_schema object_name
1022-
wait/lock/table/sql/handler 45 TABLE test t1
1023-
wait/lock/table/sql/handler 82 TABLE test t3
1042+
wait/io/table/sql/handler 21 TABLE test t1
1043+
wait/lock/table/sql/handler 24 TABLE test t1
1044+
wait/io/table/sql/handler 50 TABLE test t3
1045+
wait/lock/table/sql/handler 32 TABLE test t3
10241046
execute dump_waits_index_io;
10251047
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
10261048
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -1088,8 +1110,10 @@ wait/io/table/sql/handler 71
10881110
wait/lock/table/sql/handler 56
10891111
execute dump_waits_history;
10901112
event_name count(event_name) object_type object_schema object_name
1091-
wait/lock/table/sql/handler 45 TABLE test t1
1092-
wait/lock/table/sql/handler 82 TABLE test t3
1113+
wait/io/table/sql/handler 21 TABLE test t1
1114+
wait/lock/table/sql/handler 24 TABLE test t1
1115+
wait/io/table/sql/handler 50 TABLE test t3
1116+
wait/lock/table/sql/handler 32 TABLE test t3
10931117
execute dump_waits_index_io;
10941118
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
10951119
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -1156,8 +1180,10 @@ wait/io/table/sql/handler 71
11561180
wait/lock/table/sql/handler 56
11571181
execute dump_waits_history;
11581182
event_name count(event_name) object_type object_schema object_name
1159-
wait/lock/table/sql/handler 45 TABLE test t1
1160-
wait/lock/table/sql/handler 82 TABLE test t3
1183+
wait/io/table/sql/handler 21 TABLE test t1
1184+
wait/lock/table/sql/handler 24 TABLE test t1
1185+
wait/io/table/sql/handler 50 TABLE test t3
1186+
wait/lock/table/sql/handler 32 TABLE test t3
11611187
execute dump_waits_index_io;
11621188
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
11631189
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -1223,8 +1249,10 @@ wait/io/table/sql/handler 71
12231249
wait/lock/table/sql/handler 56
12241250
execute dump_waits_history;
12251251
event_name count(event_name) object_type object_schema object_name
1226-
wait/lock/table/sql/handler 45 TABLE test t1
1227-
wait/lock/table/sql/handler 82 TABLE test t3
1252+
wait/io/table/sql/handler 21 TABLE test t1
1253+
wait/lock/table/sql/handler 24 TABLE test t1
1254+
wait/io/table/sql/handler 50 TABLE test t3
1255+
wait/lock/table/sql/handler 32 TABLE test t3
12281256
execute dump_waits_index_io;
12291257
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
12301258
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -1289,8 +1317,10 @@ wait/io/table/sql/handler 71
12891317
wait/lock/table/sql/handler 56
12901318
execute dump_waits_history;
12911319
event_name count(event_name) object_type object_schema object_name
1292-
wait/lock/table/sql/handler 45 TABLE test t1
1293-
wait/lock/table/sql/handler 82 TABLE test t3
1320+
wait/io/table/sql/handler 21 TABLE test t1
1321+
wait/lock/table/sql/handler 24 TABLE test t1
1322+
wait/io/table/sql/handler 50 TABLE test t3
1323+
wait/lock/table/sql/handler 32 TABLE test t3
12941324
execute dump_waits_index_io;
12951325
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
12961326
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -1357,8 +1387,10 @@ wait/io/table/sql/handler 71
13571387
wait/lock/table/sql/handler 56
13581388
execute dump_waits_history;
13591389
event_name count(event_name) object_type object_schema object_name
1360-
wait/lock/table/sql/handler 45 TABLE test t1
1361-
wait/lock/table/sql/handler 82 TABLE test t3
1390+
wait/io/table/sql/handler 21 TABLE test t1
1391+
wait/lock/table/sql/handler 24 TABLE test t1
1392+
wait/io/table/sql/handler 50 TABLE test t3
1393+
wait/lock/table/sql/handler 32 TABLE test t3
13621394
execute dump_waits_index_io;
13631395
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
13641396
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -1424,8 +1456,10 @@ wait/io/table/sql/handler 71
14241456
wait/lock/table/sql/handler 56
14251457
execute dump_waits_history;
14261458
event_name count(event_name) object_type object_schema object_name
1427-
wait/lock/table/sql/handler 45 TABLE test t1
1428-
wait/lock/table/sql/handler 82 TABLE test t3
1459+
wait/io/table/sql/handler 21 TABLE test t1
1460+
wait/lock/table/sql/handler 24 TABLE test t1
1461+
wait/io/table/sql/handler 50 TABLE test t3
1462+
wait/lock/table/sql/handler 32 TABLE test t3
14291463
execute dump_waits_index_io;
14301464
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
14311465
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -1491,8 +1525,10 @@ wait/io/table/sql/handler 71
14911525
wait/lock/table/sql/handler 56
14921526
execute dump_waits_history;
14931527
event_name count(event_name) object_type object_schema object_name
1494-
wait/lock/table/sql/handler 45 TABLE test t1
1495-
wait/lock/table/sql/handler 82 TABLE test t3
1528+
wait/io/table/sql/handler 21 TABLE test t1
1529+
wait/lock/table/sql/handler 24 TABLE test t1
1530+
wait/io/table/sql/handler 50 TABLE test t3
1531+
wait/lock/table/sql/handler 32 TABLE test t3
14961532
execute dump_waits_index_io;
14971533
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
14981534
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -1558,8 +1594,10 @@ wait/io/table/sql/handler 71
15581594
wait/lock/table/sql/handler 56
15591595
execute dump_waits_history;
15601596
event_name count(event_name) object_type object_schema object_name
1561-
wait/lock/table/sql/handler 45 TABLE test t1
1562-
wait/lock/table/sql/handler 82 TABLE test t3
1597+
wait/io/table/sql/handler 21 TABLE test t1
1598+
wait/lock/table/sql/handler 24 TABLE test t1
1599+
wait/io/table/sql/handler 50 TABLE test t3
1600+
wait/lock/table/sql/handler 32 TABLE test t3
15631601
execute dump_waits_index_io;
15641602
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
15651603
TABLE test t1 NULL 17 11 6 11 2 4 0
@@ -1625,8 +1663,10 @@ wait/io/table/sql/handler 0
16251663
wait/lock/table/sql/handler 0
16261664
execute dump_waits_history;
16271665
event_name count(event_name) object_type object_schema object_name
1628-
wait/lock/table/sql/handler 45 TABLE test t1
1629-
wait/lock/table/sql/handler 82 TABLE test t3
1666+
wait/io/table/sql/handler 21 TABLE test t1
1667+
wait/lock/table/sql/handler 24 TABLE test t1
1668+
wait/io/table/sql/handler 50 TABLE test t3
1669+
wait/lock/table/sql/handler 32 TABLE test t3
16301670
execute dump_waits_index_io;
16311671
object_type object_schema object_name index_name count_star count_read count_write count_fetch count_insert count_update count_delete
16321672
TABLE test t1 NULL 0 0 0 0 0 0 0

0 commit comments

Comments
 (0)