Skip to content

Commit 289c9e2

Browse files
marcalffdahlerlend
authored andcommitted
Bug#27407745 USE UTF8MB4 FOR PERFORMANCE_SCHEMA
The UTF8MB3 character set is deprecated in 8.0 Migrate performance_schema tables to UTF8MB4. In particular: - change UTF8 (meaning UTF8MB3) character set to UTF8MB4 - change utf8_bin collations to utf8mb4_bin - change utf8_general_ci collation to the default (utf8_0900_ai_ci) Adjust all test cases accordingly.
1 parent fdb04f6 commit 289c9e2

File tree

179 files changed

+1418
-1405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+1418
-1405
lines changed

mysql-test/r/information_schema.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ select * from information_schema.SCHEMATA where schema_name > 'm' ORDER BY SCHEM
2222
CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
2323
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
2424
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
25-
def performance_schema utf8 utf8_general_ci NULL
25+
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
2626
def sys utf8 utf8_general_ci NULL
2727
def test utf8mb4 utf8mb4_0900_ai_ci NULL
2828
select schema_name from information_schema.schemata ORDER BY schema_name;

mysql-test/r/information_schema_ci.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ select * from information_schema.SCHEMATA where schema_name > 'm' ORDER BY SCHEM
2222
CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH
2323
def mtr utf8mb4 utf8mb4_0900_ai_ci NULL
2424
def mysql utf8mb4 utf8mb4_0900_ai_ci NULL
25-
def performance_schema utf8 utf8_general_ci NULL
25+
def performance_schema utf8mb4 utf8mb4_0900_ai_ci NULL
2626
def sys utf8 utf8_general_ci NULL
2727
def test utf8mb4 utf8mb4_0900_ai_ci NULL
2828
select schema_name from information_schema.schemata ORDER BY schema_name;

mysql-test/r/persisted_variables_extended.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,9 @@ variables_info CREATE TABLE "variables_info" (
262262
"MIN_VALUE" varchar(64) DEFAULT NULL,
263263
"MAX_VALUE" varchar(64) DEFAULT NULL,
264264
"SET_TIME" timestamp(6) NULL DEFAULT NULL,
265-
"SET_USER" char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
266-
"SET_HOST" char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
267-
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
265+
"SET_USER" char(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
266+
"SET_HOST" char(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL
267+
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
268268
CREATE USER 'user1'@'localhost' IDENTIFIED BY 'pass1';
269269
GRANT ALL ON *.* TO 'user1'@'localhost';
270270
SET @@global.max_connections = 100;

mysql-test/r/udf.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ EXPLAIN
2727
SELECT udf_type FROM performance_schema.user_defined_functions
2828
WHERE udf_name = 'metaphon';
2929
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
30-
1 SIMPLE user_defined_functions NULL const PRIMARY PRIMARY 194 const 1 100.00 NULL
30+
1 SIMPLE user_defined_functions NULL const PRIMARY PRIMARY 258 const 1 100.00 NULL
3131
Warnings:
32-
Note 1003 /* select#1 */ select 'function' AS `udf_type` from `performance_schema`.`user_defined_functions` where ('metaphon' = 'metaphon')
32+
Note 1003 /* select#1 */ select 'function' AS `udf_type` from `performance_schema`.`user_defined_functions` where 1
3333
select myfunc_double();
3434
ERROR HY000: Can't initialize function 'myfunc_double'; myfunc_double must have at least one argument
3535
select myfunc_double(1);

mysql-test/suite/binlog_nogtid/r/binlog_persist_only_variables.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ Warnings:
3939
Warning 1287 '@@binlog_max_flush_queue_time' is deprecated and will be removed in a future release.
4040
Warning 1287 '@@binlog_max_flush_queue_time' is deprecated and will be removed in a future release.
4141
SET PERSIST_ONLY binlog_order_commits = @@GLOBAL.binlog_order_commits;
42-
SET PERSIST_ONLY binlog_rows_query_log_events = @@GLOBAL.binlog_rows_query_log_events;
4342
SET PERSIST_ONLY binlog_row_image = @@GLOBAL.binlog_row_image;
4443
SET PERSIST_ONLY binlog_row_metadata = @@GLOBAL.binlog_row_metadata;
4544
SET PERSIST_ONLY binlog_row_value_options = @@GLOBAL.binlog_row_value_options;
45+
SET PERSIST_ONLY binlog_rows_query_log_events = @@GLOBAL.binlog_rows_query_log_events;
4646
SET PERSIST_ONLY binlog_stmt_cache_size = @@GLOBAL.binlog_stmt_cache_size;
4747
SET PERSIST_ONLY binlog_transaction_dependency_history_size = @@GLOBAL.binlog_transaction_dependency_history_size;
4848
SET PERSIST_ONLY binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
@@ -144,10 +144,10 @@ RESET PERSIST binlog_group_commit_sync_no_delay_count;
144144
RESET PERSIST binlog_gtid_simple_recovery;
145145
RESET PERSIST binlog_max_flush_queue_time;
146146
RESET PERSIST binlog_order_commits;
147-
RESET PERSIST binlog_rows_query_log_events;
148147
RESET PERSIST binlog_row_image;
149148
RESET PERSIST binlog_row_metadata;
150149
RESET PERSIST binlog_row_value_options;
150+
RESET PERSIST binlog_rows_query_log_events;
151151
RESET PERSIST binlog_stmt_cache_size;
152152
RESET PERSIST binlog_transaction_dependency_history_size;
153153
RESET PERSIST binlog_transaction_dependency_tracking;

mysql-test/suite/binlog_nogtid/r/binlog_persist_variables.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ Warnings:
4040
Warning 1287 '@@binlog_max_flush_queue_time' is deprecated and will be removed in a future release.
4141
Warning 1287 '@@binlog_max_flush_queue_time' is deprecated and will be removed in a future release.
4242
SET PERSIST binlog_order_commits = @@GLOBAL.binlog_order_commits;
43-
SET PERSIST binlog_rows_query_log_events = @@GLOBAL.binlog_rows_query_log_events;
4443
SET PERSIST binlog_row_image = @@GLOBAL.binlog_row_image;
4544
SET PERSIST binlog_row_metadata = @@GLOBAL.binlog_row_metadata;
4645
SET PERSIST binlog_row_value_options = @@GLOBAL.binlog_row_value_options;
46+
SET PERSIST binlog_rows_query_log_events = @@GLOBAL.binlog_rows_query_log_events;
4747
SET PERSIST binlog_stmt_cache_size = @@GLOBAL.binlog_stmt_cache_size;
4848
SET PERSIST binlog_transaction_dependency_history_size = @@GLOBAL.binlog_transaction_dependency_history_size;
4949
SET PERSIST binlog_transaction_dependency_tracking = @@GLOBAL.binlog_transaction_dependency_tracking;
@@ -151,10 +151,10 @@ Warnings:
151151
Warning 3615 Variable binlog_gtid_simple_recovery does not exist in persisted config file
152152
RESET PERSIST IF EXISTS binlog_max_flush_queue_time;
153153
RESET PERSIST IF EXISTS binlog_order_commits;
154-
RESET PERSIST IF EXISTS binlog_rows_query_log_events;
155154
RESET PERSIST IF EXISTS binlog_row_image;
156155
RESET PERSIST IF EXISTS binlog_row_metadata;
157156
RESET PERSIST IF EXISTS binlog_row_value_options;
157+
RESET PERSIST IF EXISTS binlog_rows_query_log_events;
158158
RESET PERSIST IF EXISTS binlog_stmt_cache_size;
159159
RESET PERSIST IF EXISTS binlog_transaction_dependency_history_size;
160160
RESET PERSIST IF EXISTS binlog_transaction_dependency_tracking;

0 commit comments

Comments
 (0)