mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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.
This commit is contained in:
committed by
Oleksandr Byelkin
parent
c366845a0b
commit
2fdb556e04
@@ -59,13 +59,15 @@ static my_bool mrn_snippet_prepare(st_mrn_snip_info *snip_info, UDF_ARGS *args,
|
||||
grn_snip_mapping *mapping = NULL;
|
||||
grn_rc rc;
|
||||
String *result_str = &snip_info->result_str;
|
||||
myf utf8_flag= current_thd->get_utf8_flag();
|
||||
|
||||
*snippet = NULL;
|
||||
snip_max_len = *((long long *) args->args[1]);
|
||||
snip_max_num = *((long long *) args->args[2]);
|
||||
|
||||
if (args->arg_type[3] == STRING_RESULT) {
|
||||
if (!(cs = get_charset_by_name(args->args[3], MYF(0)))) {
|
||||
if (!(cs = get_charset_by_name(args->args[3],
|
||||
MYF(utf8_flag)))) {
|
||||
snprintf(message, MYSQL_ERRMSG_SIZE,
|
||||
"Unknown charset: <%s>", args->args[3]);
|
||||
goto error;
|
||||
|
Reference in New Issue
Block a user