mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 01:05:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

Browse source 
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
This commit is contained in:
unknown 2005-06-20 15:02:45 -07:00
commit 3f6501c5e5
6 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
myisam/ft_boolean_search.c
View file

@ -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;