diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-09 16:33:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-09 16:33:48 +0100 |
| commit | 3e8155c637096da8fd019c42b78746be2bf89944 (patch) | |
| tree | 7df7880c789de7c32fdd76e862170322afe6117c /storage/myisam/ft_boolean_search.c | |
| parent | 106664f8e86d694a9898c3e564bb72290f221bd6 (diff) | |
| parent | 03dabfa84d6bc9a8197c8d9fbe80f2a7f6a5b6ac (diff) | |
| download | mariadb-git-3e8155c637096da8fd019c42b78746be2bf89944.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'storage/myisam/ft_boolean_search.c')
| -rw-r--r-- | storage/myisam/ft_boolean_search.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c index 766f8411ca1..4145ca75483 100644 --- a/storage/myisam/ft_boolean_search.c +++ b/storage/myisam/ft_boolean_search.c @@ -195,12 +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 ? HA_MAX_KEY_BUFF : - (word_len + 1) * - 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; |