diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:03:32 +0300 |
| commit | a736a3174a4e7c0d92a38901ae61f563d4afede7 (patch) | |
| tree | 348d15f7c9cc883e86d852fbddc780f506669ee4 /storage/myisam | |
| parent | b44e12fef176bfc0884fb2c5f4ba7f42bf054f44 (diff) | |
| parent | 4a7dfda373ff9e28e4f4f35bad76cbfc20934a9a (diff) | |
| download | mariadb-git-a736a3174a4e7c0d92a38901ae61f563d4afede7.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ft_parser.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/storage/myisam/ft_parser.c b/storage/myisam/ft_parser.c index b400990d934..bc50301fab2 100644 --- a/storage/myisam/ft_parser.c +++ b/storage/myisam/ft_parser.c @@ -78,18 +78,25 @@ FT_WORD * ft_linearize(TREE *wtree, MEM_ROOT *mem_root) DBUG_RETURN(wlist); } -my_bool ft_boolean_check_syntax_string(const uchar *str) +my_bool ft_boolean_check_syntax_string(const uchar *str, size_t length, + CHARSET_INFO *cs) { uint i, j; + if (cs->mbminlen != 1) + { + DBUG_ASSERT(0); + return 1; + } + if (!str || - (strlen((char*) str)+1 != sizeof(DEFAULT_FTB_SYNTAX)) || + (length + 1 != sizeof(DEFAULT_FTB_SYNTAX)) || (str[0] != ' ' && str[1] != ' ')) return 1; for (i=0; i<sizeof(DEFAULT_FTB_SYNTAX); i++) { /* limiting to 7-bit ascii only */ - if ((unsigned char)(str[i]) > 127 || my_isalnum(default_charset_info, str[i])) + if ((unsigned char)(str[i]) > 127 || my_isalnum(cs, str[i])) return 1; for (j=0; j<i; j++) if (str[i] == str[j] && (i != 11 || j != 10)) |