diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-29 15:41:05 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-29 15:41:05 +0100 |
| commit | 41a163ac5ccf4ac5394edc84e40b3f47acea6b08 (patch) | |
| tree | 60d5259e290b4a0166d8ef1651975b14b5afe304 /storage/maria | |
| parent | a85d942be9008cf19086d8bd330c4be83a18167f (diff) | |
| parent | e2b50213cf12623da31c8b49be4d40772876223c (diff) | |
| download | mariadb-git-41a163ac5ccf4ac5394edc84e40b3f47acea6b08.tar.gz | |
Merge branch '10.2' into 10.3mariadb-10.3.33
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_ft_boolean_search.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/storage/maria/ma_ft_boolean_search.c b/storage/maria/ma_ft_boolean_search.c index 70ab6b2e3f6..7fe6d8ca2cc 100644 --- a/storage/maria/ma_ft_boolean_search.c +++ b/storage/maria/ma_ft_boolean_search.c @@ -195,11 +195,7 @@ static int ftb_query_add_word(MYSQL_FTPARSER_PARAM *param, switch (info->type) { case FT_TOKEN_WORD: ftbw= (FTB_WORD *)alloc_root(&ftb_param->ftb->mem_root, - sizeof(FTB_WORD) + - (info->trunc ? MARIA_MAX_KEY_BUFF : - word_len * ftb_param->ftb->charset->mbmaxlen + - HA_FT_WLEN + - ftb_param->ftb->info->s->rec_reflength)); + sizeof(FTB_WORD) + HA_MAX_KEY_BUFF); ftbw->len= word_len + 1; ftbw->flags= 0; ftbw->off= 0; |