From b0910dddf53e2b41d5257bb5bda81f885044048a Mon Sep 17 00:00:00 2001 From: Monty Date: Sat, 22 Aug 2020 02:09:34 +0300 Subject: [PATCH] Fix test of characterset used with fulltext index in InnoDB --- storage/innobase/handler/ha_innodb.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 5d2e96f4882..f1843711c0c 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -9437,12 +9437,10 @@ ha_innobase::ft_init_ext( } } - /* FIXME: utf32 and utf16 are not compatible with some - string function used. So to convert them to uft8 before - we proceed. */ - if (strcmp(char_set->csname, "utf32") == 0 - || strcmp(char_set->csname, "utf16") == 0) { - + /* Multi byte character sets like utf32 and utf16 are not + compatible with some string function used. So to convert them + to uft8 before we proceed. */ + if (char_set->mbminlen != 1) { buf_tmp_used = innobase_convert_string( buf_tmp, sizeof(buf_tmp) - 1, &my_charset_utf8mb3_general_ci,