From bfc10f2c99f0f92d36d718a51eae292c36197869 Mon Sep 17 00:00:00 2001 From: Yura Sorokin Date: Tue, 22 Oct 2024 01:47:12 +0200 Subject: [PATCH] PS-9237 feature: Include support for utf8mb4_0900_ai_ci in MySQL 5.7 (SET collation_connection mtr) https://perconadev.atlassian.net/browse/PS-9237 'main.percona_default_collation_for_utf8mb4_extensions' MTR test case extended with additional checks for 'SET collation_connection'. --- ...ona_default_collation_for_utf8mb4_extensions.result | 2 ++ ...rcona_default_collation_for_utf8mb4_extensions.test | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/percona_default_collation_for_utf8mb4_extensions.result b/mysql-test/r/percona_default_collation_for_utf8mb4_extensions.result index bbc72c90c9ec..05570c42ba56 100644 --- a/mysql-test/r/percona_default_collation_for_utf8mb4_extensions.result +++ b/mysql-test/r/percona_default_collation_for_utf8mb4_extensions.result @@ -109,6 +109,8 @@ SET CHARACTER SET DEFAULT; CREATE TABLE t6(id BIGINT UNSIGNED); SET CHARACTER SET utf8mb4; CREATE TABLE t7(id BIGINT UNSIGNED); +SET collation_connection = utf8mb4_general_ci; +CREATE TABLE t8(id BIGINT UNSIGNED); *** Making sure that binlog events created implicitly via stored procedures diff --git a/mysql-test/t/percona_default_collation_for_utf8mb4_extensions.test b/mysql-test/t/percona_default_collation_for_utf8mb4_extensions.test index ab5554d7dfc2..cb37f6507ad3 100644 --- a/mysql-test/t/percona_default_collation_for_utf8mb4_extensions.test +++ b/mysql-test/t/percona_default_collation_for_utf8mb4_extensions.test @@ -82,11 +82,19 @@ CREATE TABLE t4(id BIGINT UNSIGNED); SET NAMES utf8mb4 COLLATE utf8mb4_general_ci; CREATE TABLE t5(id BIGINT UNSIGNED); # Note that 'SET NAMES utf8mb4 COLLATE utf8mb4_0900_ai_ci' will generate -# character_set_client=45 in the binary log +# character_set_client=255 in the binary log. SET CHARACTER SET DEFAULT; CREATE TABLE t6(id BIGINT UNSIGNED); SET CHARACTER SET utf8mb4; CREATE TABLE t7(id BIGINT UNSIGNED); +SET collation_connection = utf8mb4_general_ci; +CREATE TABLE t8(id BIGINT UNSIGNED); +# Note that 'SET collation_connection = utf8mb4_0900_ai_ci' will generate +# character_set_client=255 in the binary log. +# Also statements like 'SET collation_connection = utf8mb4' when we try to +# assign a character set name to a collation variable are considered +# syntactically incorrect, so we do not include such checks into the test +# plan. --echo