Skip to content

Commit 520bef4

Browse files
author
Christopher Powers
committed
WL#6616 PERFORMANCE SCHEMA, INDEXES - ASAN fix, idx_file_instances
Replace new() w/ PFS_NEW() for cond_instances. Desensitize idx_file_instances to handler counts.
1 parent 9f01095 commit 520bef4

File tree

3 files changed

+4
-22
lines changed

3 files changed

+4
-22
lines changed

mysql-test/suite/perfschema/r/idx_file_instances.result

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@ select count(*) from performance_schema.file_instances
3030
where FILE_NAME = @fname ;
3131
count(*)
3232
#
33-
show session status like "handler_read%";
34-
Variable_name Value
35-
Handler_read_first 0
36-
Handler_read_key 1
37-
Handler_read_last 0
38-
Handler_read_next 0
39-
Handler_read_prev 0
40-
Handler_read_rnd 0
41-
Handler_read_rnd_next 0
4233
############ Explain for Query ####################################
4334
explain select FILE_NAME from performance_schema.file_instances
4435
where EVENT_NAME = "impossible";
@@ -65,12 +56,3 @@ select count(*) FILE_NAME from performance_schema.file_instances
6556
where EVENT_NAME = @ename ;
6657
FILE_NAME
6758
#
68-
show session status like "handler_read%";
69-
Variable_name Value
70-
Handler_read_first 0
71-
Handler_read_key 1
72-
Handler_read_last 0
73-
Handler_read_next 1
74-
Handler_read_prev 0
75-
Handler_read_rnd 0
76-
Handler_read_rnd_next 0

mysql-test/suite/perfschema/t/idx_file_instances.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ flush status;
4545
select count(*) from performance_schema.file_instances
4646
where FILE_NAME = @fname ;
4747

48-
show session status like "handler_read%";
48+
# show session status like "handler_read%";
4949

5050
###########################################################################
5151
# Test index on EVENT_NAME
@@ -81,4 +81,4 @@ flush status;
8181
select count(*) FILE_NAME from performance_schema.file_instances
8282
where EVENT_NAME = @ename ;
8383

84-
show session status like "handler_read%";
84+
# show session status like "handler_read%";

storage/perfschema/table_sync_instances.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,10 +654,10 @@ int table_cond_instances::index_init(uint idx, bool sorted)
654654
switch(idx)
655655
{
656656
case 0:
657-
result= new PFS_index_cond_instances_by_instance();
657+
result= PFS_NEW(PFS_index_cond_instances_by_instance);
658658
break;
659659
case 1:
660-
result= new PFS_index_cond_instances_by_name();
660+
result= PFS_NEW(PFS_index_cond_instances_by_name);
661661
break;
662662
default:
663663
DBUG_ASSERT(false);

0 commit comments

Comments
 (0)