diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 23:05:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-04-26 23:05:26 +0200 |
| commit | 872649c7baab3a9f7efdda78e49c4bc7dd481d91 (patch) | |
| tree | 4fffb1a99ca36ccea65e64bcaa81293c40e7539f /storage/myisam/ft_boolean_search.c | |
| parent | 4995bcffaded6a02106632fb8f259cd3d9048dc4 (diff) | |
| parent | 4f1ad43992d75676687f29da96dd7c4147247a8f (diff) | |
| download | mariadb-git-872649c7baab3a9f7efdda78e49c4bc7dd481d91.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 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c index 6befe3b2d7a..766f8411ca1 100644 --- a/storage/myisam/ft_boolean_search.c +++ b/storage/myisam/ft_boolean_search.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -197,7 +197,8 @@ static int ftb_query_add_word(MYSQL_FTPARSER_PARAM *param, ftbw= (FTB_WORD *)alloc_root(&ftb_param->ftb->mem_root, sizeof(FTB_WORD) + (info->trunc ? HA_MAX_KEY_BUFF : - word_len * ftb_param->ftb->charset->mbmaxlen + + (word_len + 1) * + ftb_param->ftb->charset->mbmaxlen + HA_FT_WLEN + ftb_param->ftb->info->s->rec_reflength)); ftbw->len= word_len + 1; |