summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-06-20 15:02:45 -0700
committerjimw@mysql.com <>2005-06-20 15:02:45 -0700
commit99e35c84ac614734d83b2349c06fce3ce9a1e2c0 (patch)
tree771ab84f683c6b6d523ddedf80755c104e17cca7 /myisam
parent9c79bc7e7301afc452d09639a7d7412b394440a4 (diff)
parentf36ee2a96deac16221956e4fbd93009872a438a5 (diff)
downloadmariadb-git-99e35c84ac614734d83b2349c06fce3ce9a1e2c0.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'myisam')
-rw-r--r--myisam/ft_boolean_search.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index 530f0d56c4c..35c41b7d2d6 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -410,7 +410,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
Hack: instead of init_queue, we'll use reinit queue to be able
to alloc queue with alloc_root()
*/
- res=ftb->queue.max_elements=1+query_len/(min(ft_min_word_len,2)+1);
+ res=ftb->queue.max_elements=1+query_len/2;
if (!(ftb->queue.root=
(byte **)alloc_root(&ftb->mem_root, (res+1)*sizeof(void*))))
goto err;