1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test of characterset used with fulltext index in InnoDB

Browse Source
This commit is contained in:
Monty 2020-08-22 02:09:34 +03:00 committed by Sergei Golubchik
parent 6de84e6f4e
commit b0910dddf5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/innobase/handler/ha_innodb.cc
View File

@ -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,