diff options
| author | serg@serg.mylan <> | 2003-11-03 23:19:20 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2003-11-03 23:19:20 +0100 |
| commit | e1e82a4e00dd2cee2ff56accdd3fdbd5afeadb6a (patch) | |
| tree | a99f4f370f99493943a5a219b66952e3af3c712d /myisam | |
| parent | 2aff1b520be4e55048391cb020ccd27214e70f13 (diff) | |
| parent | 5505abe1026b674a46c998eb6b21a4280a542203 (diff) | |
| download | mariadb-git-e1e82a4e00dd2cee2ff56accdd3fdbd5afeadb6a.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_boolean_search.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index 6a7b7531d4d..72c54bd0c5b 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -308,7 +308,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/(ft_min_word_len+1); + res=ftb->queue.max_elements=1+query_len/(min(ft_min_word_len,2)+1); ftb->queue.root=(byte **)alloc_root(&ftb->mem_root, (res+1)*sizeof(void*)); reinit_queue(& ftb->queue, res, 0, 0, (int (*)(void*,byte*,byte*))FTB_WORD_cmp, 0); |