Commit 641bd4ec authored by unknown's avatar unknown
Browse files

Merge jwinstead@production.mysql.com:my/mysql-4.1-7858 

into  mysql.com:/home/jimw/my/mysql-4.1-clean
parents 79444fa5 61b2a6b0

myisam/ft_boolean_search.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,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;

mysql-test/r/fulltext.result

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ insert into t2 values (3, 1, 'xxbuz'); 
select * from t1 join t2 using(`t1_id`) where match (t1.name, t2.name) against('xxfoo' in boolean mode);

t1_id	name	t2_id	t1_id	name

1	data1	1	1	xxfoo

select * from t2 where match name against ('a* b* c* d* e* f*' in boolean mode);

select * from t2 where match name against ('*a*b*c*d*e*f*' in boolean mode);

t2_id	t1_id	name

drop table t1,t2;

create table t1 (a text, fulltext key (a));

mysql-test/t/fulltext.test

+2 −2
Original line number Diff line number Diff line
@@ -253,9 +253,9 @@ insert into t2 values (3, 1, 'xxbuz'); 
select * from t1 join t2 using(`t1_id`) where match (t1.name, t2.name) against('xxfoo' in boolean mode);



#

# bug with many short (< ft_min_word_len) words in boolean search

# Bug #7858: bug with many short (< ft_min_word_len) words in boolean search

#

select * from t2 where match name against ('a* b* c* d* e* f*' in boolean mode);

select * from t2 where match name against ('*a*b*c*d*e*f*' in boolean mode);

drop table t1,t2;



#