diff options
| author | unknown <jimw@mysql.com> | 2005-06-20 15:02:45 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-06-20 15:02:45 -0700 |
| commit | 3f6501c5e5eb3a793cc7bcafbcfe0abb129693ad (patch) | |
| tree | 771ab84f683c6b6d523ddedf80755c104e17cca7 /myisam | |
| parent | 2bf4fa73de38c2d353a9b1263f80251b4641419a (diff) | |
| parent | e17de6ecb472e84c7f826f6ac77c236ce952b9a8 (diff) | |
| download | mariadb-git-3f6501c5e5eb3a793cc7bcafbcfe0abb129693ad.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
client/mysql.cc:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
vio/viosocket.c:
Auto merged
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 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; |