bk commit into 4.1 tree (jimw:1.2301) BUG#7858

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jwinstead. When jwinstead does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2301 05/06/17 21:44:17 jimw@stripped +3 -0
  Fix hang/crash with Boolean full-text search against an unindexed field for
  which the query contained more words than we allocated space. (Bug #7858)

  mysql-test/r/fulltext.result
    1.74 05/06/17 21:42:58 jimw@stripped +1 -1
    Update results

  mysql-test/t/fulltext.test
    1.72 05/06/17 21:42:29 jimw@stripped +2 -2
    Modify test to be specific to reported bug (fix for old bug wasn't quite enough)

  myisam/ft_boolean_search.c
    1.88 05/06/17 20:55:26 jimw@stripped +1 -1
    Fix calculation of max number of elements -- "words" may not have spaces
    between them.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	production.mysql.com
# Root:	/usersnfs/jwinstead/my/mysql-4.1-7858

--- 1.73/mysql-test/r/fulltext.result	2005-02-16 11:04:34 +01:00
+++ 1.74/mysql-test/r/fulltext.result	2005-06-17 21:42:58 +02:00
@@ -338,7 +338,7 @@
 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));

--- 1.71/mysql-test/t/fulltext.test	2005-02-16 11:04:34 +01:00
+++ 1.72/mysql-test/t/fulltext.test	2005-06-17 21:42:29 +02:00
@@ -253,9 +253,9 @@
 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;
 
 #

--- 1.87/myisam/ft_boolean_search.c	2005-02-14 15:12:06 +01:00
+++ 1.88/myisam/ft_boolean_search.c	2005-06-17 20:55:26 +02:00
@@ -398,7 +398,7 @@
     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;