Skip to content

Commit 43c8246

Browse files
marcalffdahlerlend
marcalff
authored and
dahlerlend
committed
BUG#27675959 CHANGE SYS SCHEMA TO USE UTF8MB4
Part 2, adjust more tests results.
1 parent 4a8ccb2 commit 43c8246

File tree

6 files changed

+6
-13
lines changed

6 files changed

+6
-13
lines changed

‎mysql-test/r/mdl_tablespace.result

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -779,13 +779,9 @@ wait/lock/metadata/sql/mdl ts1 TABLESPACE metadata lock
779779
CALL sys.ps_setup_disable_instrument('wait');
780780
summary
781781
Disabled X instruments
782-
Warnings:
783-
Warning X 'utfX' is currently an alias for the character set UTFXMBX, which will be replaced by UTFXMBX in a future release. Please consider using UTFXMBX in order to be unambiguous.
784782
CALL sys.ps_setup_enable_instrument('wait/lock/metadata/sql/mdl');
785783
summary
786784
Enabled 1 instrument
787-
Warnings:
788-
Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, which will be replaced by UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
789785
TRUNCATE TABLE performance_schema.events_waits_history_long;
790786
SET DEBUG_SYNC= 'now SIGNAL cont_con1';
791787
#

‎mysql-test/r/mysql_upgrade.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ mysql.time_zone_name OK
197197
mysql.time_zone_transition OK
198198
mysql.time_zone_transition_type OK
199199
mysql.user OK
200-
The sys schema is already up to date (version 1.6.0).
200+
The sys schema is already up to date (version 2.0.0).
201201
Checking databases.
202202
mtr.global_suppressions OK
203203
mtr.test_suppressions OK
@@ -245,7 +245,7 @@ mysql.time_zone_name OK
245245
mysql.time_zone_transition OK
246246
mysql.time_zone_transition_type OK
247247
mysql.user OK
248-
The sys schema is already up to date (version 1.6.0).
248+
The sys schema is already up to date (version 2.0.0).
249249
Checking databases.
250250
mtr.global_suppressions OK
251251
mtr.test_suppressions OK

‎mysql-test/r/mysql_upgrade_options.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ mysql.time_zone_name OK
719719
mysql.time_zone_transition OK
720720
mysql.time_zone_transition_type OK
721721
mysql.user OK
722-
The sys schema is already up to date (version 1.6.0).
722+
The sys schema is already up to date (version 2.0.0).
723723
Checking databases.
724724
mtr.global_suppressions OK
725725
mtr.test_suppressions OK

‎mysql-test/r/transactional_acl_tables.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1804,7 +1804,7 @@ mysql.time_zone_transition OK
18041804
mysql.time_zone_transition_type OK
18051805
mysql.user OK
18061806
mysql.user_bak OK
1807-
The sys schema is already up to date (version 1.6.0).
1807+
The sys schema is already up to date (version 2.0.0).
18081808
Checking databases.
18091809
mtr.global_suppressions OK
18101810
mtr.test_suppressions OK

‎mysql-test/suite/funcs_1/r/is_triggers.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
8282
OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
8383
OR action_reference_new_table IS NOT NULL;
8484
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
85-
def sys sys_config_insert_set_user INSERT def sys sys_config 1 NULL BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8 utf8_general_ci utf8_general_ci
86-
def sys sys_config_update_set_user UPDATE def sys sys_config 1 NULL BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8 utf8_general_ci utf8_general_ci
85+
def sys sys_config_insert_set_user INSERT def sys sys_config 1 NULL BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8mb4 utf8mb4_0900_ai_ci utf8mb4_0900_ai_ci
86+
def sys sys_config_update_set_user UPDATE def sys sys_config 1 NULL BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8mb4 utf8mb4_0900_ai_ci utf8mb4_0900_ai_ci
8787
def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SET GLOBAL regexp_time_limit = 0; SELECT "" REGEXP NEW.pattern INTO dummy; SET GLOBAL regexp_time_limit = DEFAULT; END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
8888
def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SET GLOBAL regexp_time_limit = 0; SELECT "" REGEXP NEW.pattern INTO dummy; SET GLOBAL regexp_time_limit = DEFAULT; END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
8989
##################################################################################

‎mysql-test/suite/rpl/r/rpl_row_find_row.result

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,5 @@ FROM sys.schema_index_statistics
6969
WHERE index_name = 'idx_id';
7070
rows_selected
7171
0
72-
Warnings:
73-
Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, which will be replaced by UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
74-
Warning 3719 'utf8' is currently an alias for the character set UTF8MB3, which will be replaced by UTF8MB4 in a future release. Please consider using UTF8MB4 in order to be unambiguous.
7572
DROP TABLE t1;
7673
include/rpl_end.inc

0 commit comments

Comments
 (0)