From 2fdb556e045e9918410086eeaac5a94a4c028626 Mon Sep 17 00:00:00 2001 From: Rucha Deodhar Date: Mon, 15 Feb 2021 01:39:37 +0530 Subject: MDEV-8334: Rename utf8 to utf8mb3 This patch changes the main name of 3 byte character set from utf8 to utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default, so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4. --- sql-common/client.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sql-common') diff --git a/sql-common/client.c b/sql-common/client.c index 22ebd6dae00..34e8f7f755e 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1747,12 +1747,14 @@ mysql_set_character_set_with_default_collation(MYSQL *mysql) charsets_dir=mysql->options.charset_dir; if ((mysql->charset= get_charset_by_csname(mysql->options.charset_name, - MY_CS_PRIMARY, MYF(MY_WME)))) + MY_CS_PRIMARY, MYF(MY_WME| + MY_UTF8_IS_UTF8MB3)))) { /* Try to set compiled default collation when it's possible. */ CHARSET_INFO *collation; if ((collation= - get_charset_by_name(MYSQL_DEFAULT_COLLATION_NAME, MYF(MY_WME))) && + get_charset_by_name(MYSQL_DEFAULT_COLLATION_NAME, MYF(MY_UTF8_IS_UTF8MB3 | + MY_WME))) && my_charset_same(mysql->charset, collation)) { mysql->charset= collation; @@ -4095,7 +4097,7 @@ int STDCALL mysql_set_character_set(MYSQL *mysql, const char *cs_name) charsets_dir= mysql->options.charset_dir; if (strlen(cs_name) < MY_CS_NAME_SIZE && - (cs= get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(0)))) + (cs= get_charset_by_csname(cs_name, MY_CS_PRIMARY, MYF(MY_UTF8_IS_UTF8MB3)))) { char buff[MY_CS_NAME_SIZE + 10]; charsets_dir= save_csdir; -- cgit v1.2.1