diff options
| author | Tingyao Nian <tingynia@amazon.com> | 2023-03-15 19:14:01 +0000 |
|---|---|---|
| committer | Tingyao Nian <tingynia@amazon.com> | 2023-03-20 23:33:35 +0000 |
| commit | dfa572c170bd76f04d973c9a73daeddad55ea728 (patch) | |
| tree | 9fd73b3a34181c1350321536051384a2924d37ed /mysql-test/main/mysqlbinlog-innodb.result | |
| parent | eec1d6ce3dc9352eae97c11bbcbc506d18d188ef (diff) | |
| download | mariadb-git-bb-10.9-bar-MDEV-30824.tar.gz | |
[MDEV-30824] Fix binlog to use 'String' for setting 'character_set_client'bb-10.9-bar-MDEV-30824
Commit a923d6f49c1ad6fd3f4d6ec02e444c26e4d1dfa8 disabled numeric setting
of character_set_* variables with non-default values:
MariaDB [(none)]> set character_set_client=224;
ERROR 1115 (42000): Unknown character set: '224'
However the corresponding binlog functionality still write numeric
values for log event, and this will break binlog replay if the value is
not default. Now make the server use 'String' type for
'character_set_client' when generating binlog events
Before:
/*!\C utf8mb4 *//*!*/;
SET @@session.character_set_client=224,@@session.collation_connection=224,@@session.collation_server=33/*!*/;
After:
/*!\C utf8mb4 *//*!*/;
SET @@session.character_set_client=utf8mb4,@@session.collation_connection=33,@@session.collation_server=8/*!*/;
Note: prior to the previous commit, setting with '224' or '45' or
'utf8mb4' have the same effect, as they all set the parameter to
'utf8mb4'.
All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
Diffstat (limited to 'mysql-test/main/mysqlbinlog-innodb.result')
| -rw-r--r-- | mysql-test/main/mysqlbinlog-innodb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mysqlbinlog-innodb.result b/mysql-test/main/mysqlbinlog-innodb.result index be34c273019..566563bff76 100644 --- a/mysql-test/main/mysqlbinlog-innodb.result +++ b/mysql-test/main/mysqlbinlog-innodb.result @@ -33,7 +33,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; -SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/; +SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; INSERT INTO t1 VALUES (1) @@ -64,7 +64,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=#/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C latin1 *//*!*/; -SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=#/*!*/; +SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; INSERT INTO t1 VALUES (1) |