Skip to content

Commit 03f6e0a

Browse files
marcalffmarcalff
committed
Merge branch 'mysql-8.0' into mysql-trunk
2 parents 53dd4cd + 3c7c83a commit 03f6e0a

29 files changed

+830
-138
lines changed

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
SET NAMES utf8mb4 COLLATE utf8mb4_0900_as_ci;
2+
set @euro64 = repeat(_utf8 x'E282AC', 64);
3+
set @euro37 = repeat(_utf8 x'E282AC', 37);
4+
set @query = concat("drop database if exists ", @euro37);
5+
select @query;
6+
@query
7+
drop database if exists €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€
8+
prepare stmt from @query;
9+
execute stmt;
10+
drop prepare stmt;
11+
set @query = concat("create database ", @euro37);
12+
select @query;
13+
@query
14+
create database €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€
15+
prepare stmt from @query;
16+
execute stmt;
17+
drop prepare stmt;
18+
set @query = concat("create table ", @euro37, ".", @euro37,
19+
"(a integer, bb integer, ", @euro64, " integer)");
20+
select @query;
21+
@query
22+
create table €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€.€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€(a integer, bb integer, €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ integer)
23+
prepare stmt from @query;
24+
execute stmt;
25+
drop prepare stmt;
26+
set @query = concat("insert into ", @euro37, ".", @euro37,
27+
" values (1, 2, 3)");
28+
select @query;
29+
@query
30+
insert into €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€.€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ values (1, 2, 3)
31+
prepare stmt from @query;
32+
execute stmt;
33+
drop prepare stmt;
34+
begin;
35+
set @query = concat("select * from ", @euro37, ".", @euro37);
36+
select @query;
37+
@query
38+
select * from €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€.€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€
39+
prepare stmt from @query;
40+
execute stmt;
41+
a bb €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€
42+
1 2 3
43+
drop prepare stmt;
44+
select OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COLUMN_NAME,
45+
LOCK_TYPE, LOCK_DURATION, LOCK_STATUS
46+
from performance_schema.metadata_locks
47+
order by OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COLUMN_NAME,
48+
LOCK_TYPE, LOCK_DURATION, LOCK_STATUS;
49+
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COLUMN_NAME LOCK_TYPE LOCK_DURATION LOCK_STATUS
50+
COLUMN STATISTICS performance_schema metadata_locks column_name SHARED_READ STATEMENT GRANTED
51+
COLUMN STATISTICS performance_schema metadata_locks lock_duration SHARED_READ STATEMENT GRANTED
52+
COLUMN STATISTICS performance_schema metadata_locks lock_status SHARED_READ STATEMENT GRANTED
53+
COLUMN STATISTICS performance_schema metadata_locks lock_type SHARED_READ STATEMENT GRANTED
54+
COLUMN STATISTICS performance_schema metadata_locks object_instance_begin SHARED_READ STATEMENT GRANTED
55+
COLUMN STATISTICS performance_schema metadata_locks object_name SHARED_READ STATEMENT GRANTED
56+
COLUMN STATISTICS performance_schema metadata_locks object_schema SHARED_READ STATEMENT GRANTED
57+
COLUMN STATISTICS performance_schema metadata_locks object_type SHARED_READ STATEMENT GRANTED
58+
COLUMN STATISTICS performance_schema metadata_locks owner_event_id SHARED_READ STATEMENT GRANTED
59+
COLUMN STATISTICS performance_schema metadata_locks owner_thread_id SHARED_READ STATEMENT GRANTED
60+
COLUMN STATISTICS performance_schema metadata_locks source SHARED_READ STATEMENT GRANTED
61+
SCHEMA performance_schema NULL NULL INTENTION_EXCLUSIVE TRANSACTION GRANTED
62+
TABLE performance_schema metadata_locks NULL SHARED_READ TRANSACTION GRANTED
63+
TABLE €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€ NULL SHARED_READ TRANSACTION GRANTED
64+
commit;
65+
set @query = concat("drop table ", @euro37, ".", @euro37);
66+
select @query;
67+
@query
68+
drop table €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€.€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€
69+
prepare stmt from @query;
70+
execute stmt;
71+
drop prepare stmt;
72+
set @query = concat("drop schema ", @euro37);
73+
select @query;
74+
@query
75+
drop schema €€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€€
76+
prepare stmt from @query;
77+
execute stmt;
78+
drop prepare stmt;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
select * from performance_schema.metadata_locks;
22
select * from performance_schema.metadata_locks
33
where object_name='foo';
4-
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME OBJECT_INSTANCE_BEGIN LOCK_TYPE LOCK_DURATION LOCK_STATUS SOURCE OWNER_THREAD_ID OWNER_EVENT_ID
4+
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COLUMN_NAME OBJECT_INSTANCE_BEGIN LOCK_TYPE LOCK_DURATION LOCK_STATUS SOURCE OWNER_THREAD_ID OWNER_EVENT_ID
55
insert into performance_schema.metadata_locks
66
set object_name='FOO', owner_thread_id=1;
77
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'metadata_locks'

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
drop table if exists gis;
2+
CREATE TABLE gis (
3+
g POLYGON SRID 4326 NOT NULL
4+
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
5+
CREATE SPATIAL INDEX g_idx ON gis(g);
6+
begin;
7+
INSERT INTO gis VALUES (
8+
ST_GeomFromText(
9+
'POLYGON((-165 -46,161 -70,-108 72,-165 -46))',
10+
4326,
11+
'axis-order=long-lat'
12+
)
13+
);
14+
select OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COLUMN_NAME,
15+
LOCK_TYPE, LOCK_DURATION, LOCK_STATUS
16+
from performance_schema.metadata_locks
17+
where OBJECT_TYPE = 'SRID';
18+
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME COLUMN_NAME LOCK_TYPE LOCK_DURATION LOCK_STATUS
19+
SRID NULL 4326 NULL SHARED_READ TRANSACTION GRANTED
20+
commit;
21+
drop table gis;

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

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ lock table explain_test_db.explain_test_table write;
55
# Connection default
66
select OBJECT_INSTANCE_BEGIN, OWNER_THREAD_ID, OWNER_EVENT_ID
77
from performance_schema.metadata_locks
8-
where OBJECT_SCHEMA = 'explain_test_db'
8+
where OBJECT_TYPE = 'TABLE'
9+
and OBJECT_SCHEMA = 'explain_test_db'
910
and OBJECT_NAME = 'explain_test_table'
1011
and LOCK_STATUS = 'GRANTED'
1112
into @oib, @o_tid, @o_eid;
@@ -50,7 +51,7 @@ LOCK_TYPE
5051
OK: handler_read_key incremented
5152

5253
====================================================================
53-
Testing index for columns OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME
54+
Testing index for columns OBJECT_TYPE, OBJECT_SCHEMA, OBJECT_NAME, COLUMN_NAME
5455
====================================================================
5556
############ Explain for Query ####################################
5657
explain select LOCK_TYPE
@@ -151,15 +152,60 @@ and OBJECT_SCHEMA = "explain_test_db"
151152
and OBJECT_NAME = "explain_test_table";
152153
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
153154
1 SIMPLE metadata_locks NULL ref OBJECT_TYPE OBJECT_TYPE 584 const,const,const # 100.00 NULL
155+
############ Explain for Query ####################################
156+
explain select LOCK_TYPE
157+
from performance_schema.metadata_locks
158+
where OBJECT_TYPE = "impossible"
159+
and OBJECT_SCHEMA = "impossible"
160+
and OBJECT_NAME = "impossible"
161+
and COLUMN_NAME = "impossible";
162+
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
163+
1 SIMPLE metadata_locks NULL ref OBJECT_TYPE OBJECT_TYPE 779 const,const,const,const # 100.00 NULL
164+
############ Explain for Query ####################################
165+
explain select LOCK_TYPE
166+
from performance_schema.metadata_locks
167+
where OBJECT_TYPE = "TABLE"
168+
and OBJECT_SCHEMA = "explain_test_db"
169+
and OBJECT_NAME = "explain_test_table"
170+
and COLUMN_NAME = "impossible";
171+
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
172+
1 SIMPLE metadata_locks NULL ref OBJECT_TYPE OBJECT_TYPE 779 const,const,const,const # 100.00 NULL
173+
############ Explain for Query ####################################
174+
explain select LOCK_TYPE
175+
from performance_schema.metadata_locks
176+
where OBJECT_TYPE = "TABLE"
177+
and OBJECT_SCHEMA = "explain_test_db"
178+
and OBJECT_NAME = "explain_test_table"
179+
and COLUMN_NAME > "impossible";
180+
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
181+
1 SIMPLE metadata_locks NULL ref OBJECT_TYPE OBJECT_TYPE 584 const,const,const # 33.33 Using where
182+
############ Explain for Query ####################################
183+
explain select LOCK_TYPE
184+
from performance_schema.metadata_locks
185+
where OBJECT_TYPE = "TABLE"
186+
and OBJECT_SCHEMA = "explain_test_db"
187+
and OBJECT_NAME = "explain_test_table"
188+
and COLUMN_NAME < "impossible";
189+
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
190+
1 SIMPLE metadata_locks NULL ref OBJECT_TYPE OBJECT_TYPE 584 const,const,const # 33.33 Using where
191+
############ Explain for Query ####################################
192+
explain select LOCK_TYPE
193+
from performance_schema.metadata_locks
194+
where OBJECT_TYPE = "TABLE"
195+
and OBJECT_SCHEMA = "explain_test_db"
196+
and OBJECT_NAME = "explain_test_table"
197+
and COLUMN_NAME = "a";
198+
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
199+
1 SIMPLE metadata_locks NULL ref OBJECT_TYPE OBJECT_TYPE 779 const,const,const,const # 100.00 NULL
154200
############# Explain End #########################################
155201
flush status;
156202
select LOCK_TYPE
157203
from performance_schema.metadata_locks
158204
where OBJECT_TYPE = "TABLE"
159205
and OBJECT_SCHEMA = "explain_test_db"
160-
and OBJECT_NAME = "explain_test_table";
206+
and OBJECT_NAME = "explain_test_table"
207+
and COLUMN_NAME = "a";
161208
LOCK_TYPE
162-
#
163209
OK: handler_read_key incremented
164210

165211
====================================================================

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ memory_summary_global_by_event_name 0 performance_schema PRIMARY 1 EVENT_NAME NU
266266
metadata_locks 1 performance_schema OBJECT_TYPE 1 OBJECT_TYPE NULL
267267
metadata_locks 1 performance_schema OBJECT_TYPE 2 OBJECT_SCHEMA NULL YES
268268
metadata_locks 1 performance_schema OBJECT_TYPE 3 OBJECT_NAME NULL YES
269+
metadata_locks 1 performance_schema OBJECT_TYPE 4 COLUMN_NAME NULL YES
269270
metadata_locks 1 performance_schema OWNER_THREAD_ID 1 OWNER_THREAD_ID NULL YES
270271
metadata_locks 1 performance_schema OWNER_THREAD_ID 2 OWNER_EVENT_ID NULL YES
271272
metadata_locks 0 performance_schema PRIMARY 1 OBJECT_INSTANCE_BEGIN NULL

0 commit comments

Comments
 (0)