diff options
| author | Monty <monty@mariadb.org> | 2020-08-22 02:09:34 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2021-01-28 11:50:53 +0200 |
| commit | bd5c12ce311ac03a9581fb570c6f4e2c65afebb4 (patch) | |
| tree | 4f0ae01603dd80fd9d67e0d160c03fcc6dae22a2 | |
| parent | ebef21cce43e66edc10cc1d34e2e90e14bbb8a8f (diff) | |
| download | mariadb-git-bd5c12ce311ac03a9581fb570c6f4e2c65afebb4.tar.gz | |
Fix test of characterset used with fulltext index in InnoDB
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index f8f0377eb92..49b43ac95a7 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -9103,12 +9103,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, |