Skip to content

Commit e15fdad

Browse files
marcalffmarcalff
committed
Bug#57609 performance_schema does not work with lower_case_table_names
Merge to mysql-trunk-bugfixing (5.6), fixed 5.6 specific test cases.
1 parent fa49531 commit e15fdad

36 files changed

+234
-236
lines changed

‎mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
# See related script table_io_setup_helper.inc
1717

1818
# Cleanup
19-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
20-
truncate performance_schema.EVENTS_WAITS_HISTORY_LONG;
19+
update performance_schema.setup_consumers set enabled='NO';
20+
truncate performance_schema.events_waits_history_long;
2121
drop table test.marker;
2222
flush status;
23-
update performance_schema.SETUP_INSTRUMENTS set enabled='YES';
24-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
23+
update performance_schema.setup_instruments set enabled='YES';
24+
update performance_schema.setup_consumers set enabled='YES';
2525

‎mysql-test/suite/perfschema/include/table_io_result_helper.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
# See related script table_io_setup_helper.inc
1717

1818
# Stop table io recording
19-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
19+
update performance_schema.setup_consumers set enabled='NO';
2020
eval select event_name,
2121
left(source, locate(":", source)) as short_source,
2222
object_type, object_schema,
2323
if (locate("#sql-", object_name), "#sql-XXXX", object_name)
2424
as pretty_name,
2525
operation, number_of_bytes
26-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
26+
from performance_schema.events_waits_history_long
2727
where event_name like 'wait/io/table/%'
2828
and object_schema in ($schema_to_dump)
2929
order by thread_id, event_id;
@@ -32,6 +32,6 @@ eval select event_name,
3232
show status like 'performance_schema_%';
3333

3434
# Cleanup
35-
truncate performance_schema.EVENTS_WAITS_HISTORY_LONG;
35+
truncate performance_schema.events_waits_history_long;
3636
flush status;
3737

‎mysql-test/suite/perfschema/include/table_io_setup_helper.inc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# --source include/have_perfschema.inc
2525
# --source ../include/table_io_setup_helper.inc
2626
# ... more setup scripts as needed ...
27-
# update performance_schema.SETUP_CONSUMERS set enabled='YES';
27+
# update performance_schema.setup_consumers set enabled='YES';
2828
# ... test payload here ...
2929
# ... optionally, add this insert between statements
3030
# ... to make the final output more readable
@@ -34,7 +34,7 @@
3434
# let $schema_to_dump="db1", "db2", "db3";
3535
# --source ../include/table_io_result_helper.inc
3636
# Optional: Repeat several times
37-
# update performance_schema.SETUP_CONSUMERS set enabled='YES';
37+
# update performance_schema.setup_consumers set enabled='YES';
3838
# ... test payload here ...
3939
# --source ../include/table_io_result_helper.inc
4040
# ... cleanup
@@ -53,13 +53,13 @@ drop table if exists test.marker;
5353
# to separate table io events between statements.
5454
create table test.marker(a int);
5555

56-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
56+
update performance_schema.setup_consumers set enabled='NO';
5757

58-
update performance_schema.SETUP_INSTRUMENTS set enabled='NO';
59-
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
58+
update performance_schema.setup_instruments set enabled='NO';
59+
update performance_schema.setup_instruments set enabled='YES'
6060
where name like "wait/io/table/%";
6161

62-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
62+
truncate table performance_schema.events_waits_history_long;
6363

6464
# Reset lost counters to a known state
6565
flush status;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
drop table if exists test.marker;
22
create table test.marker(a int);
3-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
4-
update performance_schema.SETUP_INSTRUMENTS set enabled='NO';
5-
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
3+
update performance_schema.setup_consumers set enabled='NO';
4+
update performance_schema.setup_instruments set enabled='NO';
5+
update performance_schema.setup_instruments set enabled='YES'
66
where name like "wait/io/table/%";
7-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
7+
truncate table performance_schema.events_waits_history_long;
88
flush status;
99
drop table if exists test.no_index_tab;
10-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
10+
update performance_schema.setup_consumers set enabled='YES';
1111
insert into marker set a = 1;
1212
create table test.no_index_tab
1313
( a varchar(255) not null, b int not null) engine = CSV;
@@ -57,14 +57,14 @@ insert into marker set a = 1;
5757
truncate table test.no_index_tab;
5858
insert into marker set a = 1;
5959
drop table test.no_index_tab;
60-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
60+
update performance_schema.setup_consumers set enabled='NO';
6161
select event_name,
6262
left(source, locate(":", source)) as short_source,
6363
object_type, object_schema,
6464
if (locate("#sql-", object_name), "#sql-XXXX", object_name)
6565
as pretty_name,
6666
operation, number_of_bytes
67-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
67+
from performance_schema.events_waits_history_long
6868
where event_name like 'wait/io/table/%'
6969
and object_schema in ("test")
7070
order by thread_id, event_id;
@@ -126,11 +126,11 @@ Performance_schema_table_handles_lost 0
126126
Performance_schema_table_instances_lost 0
127127
Performance_schema_thread_classes_lost 0
128128
Performance_schema_thread_instances_lost 0
129-
truncate performance_schema.EVENTS_WAITS_HISTORY_LONG;
129+
truncate performance_schema.events_waits_history_long;
130130
flush status;
131-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
132-
truncate performance_schema.EVENTS_WAITS_HISTORY_LONG;
131+
update performance_schema.setup_consumers set enabled='NO';
132+
truncate performance_schema.events_waits_history_long;
133133
drop table test.marker;
134134
flush status;
135-
update performance_schema.SETUP_INSTRUMENTS set enabled='YES';
136-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
135+
update performance_schema.setup_instruments set enabled='YES';
136+
update performance_schema.setup_consumers set enabled='YES';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,4 @@ SELECT IF((COALESCE(@after_count, 0) - COALESCE(@before_count, 0)) = 0, 'Success
111111
test_fm2_rw_timed
112112
Success
113113
DROP TABLE t1;
114-
UPDATE performance_schema.SETUP_INSTRUMENTS SET enabled = 'YES', timed = 'YES';
114+
UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ drop table if exists test.no_index_tab;
22
drop table if exists test.index_tab;
33
drop table if exists test.marker;
44
create table test.marker(a int);
5-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
6-
update performance_schema.SETUP_INSTRUMENTS set enabled='NO';
7-
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
5+
update performance_schema.setup_consumers set enabled='NO';
6+
update performance_schema.setup_instruments set enabled='NO';
7+
update performance_schema.setup_instruments set enabled='YES'
88
where name like "wait/io/table/%";
9-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
9+
truncate table performance_schema.events_waits_history_long;
1010
flush status;
1111
create table test.no_index_tab
1212
( a int, b char(30) default 'Default') engine = MyISAM;
@@ -25,19 +25,19 @@ index_tab CREATE TABLE `index_tab` (
2525
`b` char(30) DEFAULT 'Default',
2626
UNIQUE KEY `uidx` (`a`)
2727
) ENGINE=MyISAM DEFAULT CHARSET=latin1
28-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
29-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
28+
truncate table performance_schema.events_waits_history_long;
29+
update performance_schema.setup_consumers set enabled='YES';
3030
# Printing of 100 inserts per table is suppressed
31-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
31+
update performance_schema.setup_consumers set enabled='NO';
3232
select COUNT(*)
33-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
33+
from performance_schema.events_waits_history_long
3434
where event_name like 'wait/io/table/%'
3535
and object_schema = 'test'
3636
and object_name = 'no_index_tab';
3737
COUNT(*)
3838
100
3939
select COUNT(*)
40-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
40+
from performance_schema.events_waits_history_long
4141
where event_name like 'wait/io/table/%'
4242
and object_schema = 'test'
4343
and object_name = 'index_tab';
@@ -49,75 +49,75 @@ count(*)
4949
select count(*) from test.index_tab;
5050
count(*)
5151
100
52-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
53-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
52+
truncate table performance_schema.events_waits_history_long;
53+
update performance_schema.setup_consumers set enabled='YES';
5454
select avg(a) from test.no_index_tab;
5555
avg(a)
5656
50.5000
57-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
57+
update performance_schema.setup_consumers set enabled='NO';
5858
select COUNT(*)
59-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
59+
from performance_schema.events_waits_history_long
6060
where event_name like 'wait/io/table/%'
6161
and object_schema = 'test'
6262
and object_name = 'no_index_tab';
6363
COUNT(*)
6464
101
65-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
66-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
65+
truncate table performance_schema.events_waits_history_long;
66+
update performance_schema.setup_consumers set enabled='YES';
6767
select avg(a) from test.index_tab;
6868
avg(a)
6969
50.5000
70-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
70+
update performance_schema.setup_consumers set enabled='NO';
7171
select COUNT(*)
72-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
72+
from performance_schema.events_waits_history_long
7373
where event_name like 'wait/io/table/%'
7474
and object_schema = 'test'
7575
and object_name = 'index_tab';
7676
COUNT(*)
7777
101
78-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
79-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
78+
truncate table performance_schema.events_waits_history_long;
79+
update performance_schema.setup_consumers set enabled='YES';
8080
select 1 as my_column from test.no_index_tab where a = 50;
8181
my_column
8282
1
83-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
83+
update performance_schema.setup_consumers set enabled='NO';
8484
select COUNT(*)
85-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
85+
from performance_schema.events_waits_history_long
8686
where event_name like 'wait/io/table/%'
8787
and object_schema = 'test'
8888
and object_name = 'no_index_tab';
8989
COUNT(*)
9090
101
91-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
92-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
91+
truncate table performance_schema.events_waits_history_long;
92+
update performance_schema.setup_consumers set enabled='YES';
9393
select 1 as my_column from test.index_tab where a = 50;
9494
my_column
9595
1
96-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
96+
update performance_schema.setup_consumers set enabled='NO';
9797
select COUNT(*)
98-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
98+
from performance_schema.events_waits_history_long
9999
where event_name like 'wait/io/table/%'
100100
and object_schema = 'test'
101101
and object_name = 'index_tab';
102102
COUNT(*)
103103
1
104-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
105-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
104+
truncate table performance_schema.events_waits_history_long;
105+
update performance_schema.setup_consumers set enabled='YES';
106106
delete from test.no_index_tab where a = 51;
107-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
107+
update performance_schema.setup_consumers set enabled='NO';
108108
select COUNT(*)
109-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
109+
from performance_schema.events_waits_history_long
110110
where event_name like 'wait/io/table/%'
111111
and object_schema = 'test'
112112
and object_name = 'no_index_tab';
113113
COUNT(*)
114114
102
115-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
116-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
115+
truncate table performance_schema.events_waits_history_long;
116+
update performance_schema.setup_consumers set enabled='YES';
117117
delete from test.index_tab where a = 51;
118-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
118+
update performance_schema.setup_consumers set enabled='NO';
119119
select COUNT(*)
120-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
120+
from performance_schema.events_waits_history_long
121121
where event_name like 'wait/io/table/%'
122122
and object_schema = 'test'
123123
and object_name = 'index_tab';
@@ -141,9 +141,9 @@ Performance_schema_thread_classes_lost 0
141141
Performance_schema_thread_instances_lost 0
142142
drop table test.no_index_tab;
143143
drop table test.index_tab;
144-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
145-
truncate performance_schema.EVENTS_WAITS_HISTORY_LONG;
144+
update performance_schema.setup_consumers set enabled='NO';
145+
truncate performance_schema.events_waits_history_long;
146146
drop table test.marker;
147147
flush status;
148-
update performance_schema.SETUP_INSTRUMENTS set enabled='YES';
149-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
148+
update performance_schema.setup_instruments set enabled='YES';
149+
update performance_schema.setup_consumers set enabled='YES';

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
drop table if exists test.marker;
22
create table test.marker(a int);
3-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
4-
update performance_schema.SETUP_INSTRUMENTS set enabled='NO';
5-
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
3+
update performance_schema.setup_consumers set enabled='NO';
4+
update performance_schema.setup_instruments set enabled='NO';
5+
update performance_schema.setup_instruments set enabled='YES'
66
where name like "wait/io/table/%";
7-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
7+
truncate table performance_schema.events_waits_history_long;
88
flush status;
99
drop table if exists test.no_index_tab;
10-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
10+
update performance_schema.setup_consumers set enabled='YES';
1111
insert into marker set a = 1;
1212
create table test.no_index_tab
1313
( a varchar(255) not null, b int not null) engine = InnoDB;
@@ -58,14 +58,14 @@ insert into marker set a = 1;
5858
truncate table test.no_index_tab;
5959
insert into marker set a = 1;
6060
drop table test.no_index_tab;
61-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
61+
update performance_schema.setup_consumers set enabled='NO';
6262
select event_name,
6363
left(source, locate(":", source)) as short_source,
6464
object_type, object_schema,
6565
if (locate("#sql-", object_name), "#sql-XXXX", object_name)
6666
as pretty_name,
6767
operation, number_of_bytes
68-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
68+
from performance_schema.events_waits_history_long
6969
where event_name like 'wait/io/table/%'
7070
and object_schema in ("test")
7171
order by thread_id, event_id;
@@ -132,11 +132,11 @@ Performance_schema_table_handles_lost 0
132132
Performance_schema_table_instances_lost 0
133133
Performance_schema_thread_classes_lost 0
134134
Performance_schema_thread_instances_lost 0
135-
truncate performance_schema.EVENTS_WAITS_HISTORY_LONG;
135+
truncate performance_schema.events_waits_history_long;
136136
flush status;
137-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
138-
truncate performance_schema.EVENTS_WAITS_HISTORY_LONG;
137+
update performance_schema.setup_consumers set enabled='NO';
138+
truncate performance_schema.events_waits_history_long;
139139
drop table test.marker;
140140
flush status;
141-
update performance_schema.SETUP_INSTRUMENTS set enabled='YES';
142-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
141+
update performance_schema.setup_instruments set enabled='YES';
142+
update performance_schema.setup_consumers set enabled='YES';

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
drop table if exists test.marker;
22
create table test.marker(a int);
3-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
4-
update performance_schema.SETUP_INSTRUMENTS set enabled='NO';
5-
update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
3+
update performance_schema.setup_consumers set enabled='NO';
4+
update performance_schema.setup_instruments set enabled='NO';
5+
update performance_schema.setup_instruments set enabled='YES'
66
where name like "wait/io/table/%";
7-
truncate table performance_schema.EVENTS_WAITS_HISTORY_LONG;
7+
truncate table performance_schema.events_waits_history_long;
88
flush status;
99
drop table if exists test.no_index_tab;
10-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
10+
update performance_schema.setup_consumers set enabled='YES';
1111
insert into marker set a = 1;
1212
create table test.no_index_tab
1313
( a varchar(255) not null, b int not null) engine = MEMORY;
@@ -57,14 +57,14 @@ insert into marker set a = 1;
5757
truncate table test.no_index_tab;
5858
insert into marker set a = 1;
5959
drop table test.no_index_tab;
60-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
60+
update performance_schema.setup_consumers set enabled='NO';
6161
select event_name,
6262
left(source, locate(":", source)) as short_source,
6363
object_type, object_schema,
6464
if (locate("#sql-", object_name), "#sql-XXXX", object_name)
6565
as pretty_name,
6666
operation, number_of_bytes
67-
from performance_schema.EVENTS_WAITS_HISTORY_LONG
67+
from performance_schema.events_waits_history_long
6868
where event_name like 'wait/io/table/%'
6969
and object_schema in ("test")
7070
order by thread_id, event_id;
@@ -128,11 +128,11 @@ Performance_schema_table_handles_lost 0
128128
Performance_schema_table_instances_lost 0
129129
Performance_schema_thread_classes_lost 0
130130
Performance_schema_thread_instances_lost 0
131-
truncate performance_schema.EVENTS_WAITS_HISTORY_LONG;
131+
truncate performance_schema.events_waits_history_long;
132132
flush status;
133-
update performance_schema.SETUP_CONSUMERS set enabled='NO';
134-
truncate performance_schema.EVENTS_WAITS_HISTORY_LONG;
133+
update performance_schema.setup_consumers set enabled='NO';
134+
truncate performance_schema.events_waits_history_long;
135135
drop table test.marker;
136136
flush status;
137-
update performance_schema.SETUP_INSTRUMENTS set enabled='YES';
138-
update performance_schema.SETUP_CONSUMERS set enabled='YES';
137+
update performance_schema.setup_instruments set enabled='YES';
138+
update performance_schema.setup_consumers set enabled='YES';

0 commit comments

Comments
 (0)