Skip to content

Commit 4d2de2b

Browse files
Bug#31138179: P_S TLS_CHANNEL_STATUS TABLE HAS INCORRECT COLLATION
Description: TLS_CHANNEL_STATUS was created with utf8mb4_bin collation. This resulted into case sensitive comparison when selecting values from the table based on where clause. Fix: Removed charset and collation information from table definition. RB: 24207
1 parent 304e920 commit 4d2de2b

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
show create table performance_schema.tls_channel_status;
22
Table Create Table
33
tls_channel_status CREATE TABLE `tls_channel_status` (
4-
`CHANNEL` varchar(128) COLLATE utf8mb4_bin NOT NULL,
5-
`PROPERTY` varchar(128) COLLATE utf8mb4_bin NOT NULL,
6-
`VALUE` varchar(2048) COLLATE utf8mb4_bin NOT NULL
7-
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin
4+
`CHANNEL` varchar(128) NOT NULL,
5+
`PROPERTY` varchar(128) NOT NULL,
6+
`VALUE` varchar(2048) NOT NULL
7+
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
88
select * from INFORMATION_SCHEMA.STATISTICS
99
where TABLE_SCHEMA = "performance_schema"
1010
and TABLE_NAME = "tls_channel_status";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ table_io_waits_summary_by_index_usage utf8mb4_0900_ai_ci NULL
870870
table_io_waits_summary_by_table utf8mb4_0900_ai_ci NULL
871871
table_lock_waits_summary_by_table utf8mb4_0900_ai_ci NULL
872872
threads utf8mb4_0900_ai_ci NULL
873-
tls_channel_status utf8mb4_bin NULL
873+
tls_channel_status utf8mb4_0900_ai_ci NULL
874874
user_defined_functions utf8mb4_0900_ai_ci NULL
875875
user_variables_by_thread utf8mb4_0900_ai_ci NULL
876876
users utf8mb4_0900_ai_ci NULL

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,9 +1369,9 @@ def performance_schema threads HISTORY 15 NULL NO enum 3 12 NULL NULL NULL utf8m
13691369
def performance_schema threads CONNECTION_TYPE 16 NULL YES varchar 16 64 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(16) select,insert,update,references NULL
13701370
def performance_schema threads THREAD_OS_ID 17 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint unsigned MUL select,insert,update,references NULL
13711371
def performance_schema threads RESOURCE_GROUP 18 NULL YES varchar 64 256 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(64) MUL select,insert,update,references NULL
1372-
def performance_schema tls_channel_status CHANNEL 1 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_bin varchar(128) select,insert,update,references NULL
1373-
def performance_schema tls_channel_status PROPERTY 2 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_bin varchar(128) select,insert,update,references NULL
1374-
def performance_schema tls_channel_status VALUE 3 NULL NO varchar 2048 8192 NULL NULL NULL utf8mb4 utf8mb4_bin varchar(2048) select,insert,update,references NULL
1372+
def performance_schema tls_channel_status CHANNEL 1 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL
1373+
def performance_schema tls_channel_status PROPERTY 2 NULL NO varchar 128 512 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(128) select,insert,update,references NULL
1374+
def performance_schema tls_channel_status VALUE 3 NULL NO varchar 2048 8192 NULL NULL NULL utf8mb4 utf8mb4_0900_ai_ci varchar(2048) select,insert,update,references NULL
13751375
def performance_schema users USER 1 NULL YES char 32 128 NULL NULL NULL utf8mb4 utf8mb4_bin char(32) UNI select,insert,update,references NULL
13761376
def performance_schema users CURRENT_CONNECTIONS 2 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint select,insert,update,references NULL
13771377
def performance_schema users TOTAL_CONNECTIONS 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint select,insert,update,references NULL

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ insert into test.pfs_published_schema
8383

8484
insert into test.pfs_published_schema
8585
values("MySQL 8.0.21",
86-
"df4d9faae12e160bfa2518c489830a6f2e24c35142c4c595ed25d9b4feaed27e");
86+
"112972e1f7d2b3a351a14979ecc3b419efc81e79dc029078a3a94955be218e5a");
8787

8888
create table test.pfs_check_table
8989
(id int NOT NULL AUTO_INCREMENT,

storage/perfschema/table_tls_channel_status.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Plugin_table table_tls_channel_status::m_table_def{
4747
" PROPERTY VARCHAR(128) NOT NULL,\n"
4848
" VALUE VARCHAR(2048) NOT NULL\n",
4949
/* Options */
50-
" ENGINE=PERFORMANCE_SCHEMA CHARACTER SET utf8mb4 COLLATE utf8mb4_bin",
50+
" ENGINE=PERFORMANCE_SCHEMA",
5151
/* Tablespace */
5252
nullptr};
5353

0 commit comments

Comments
 (0)