Merge bk-internal:/home/bk/mysql-4.0/

into serg.mylan:/usr/home/serg/Abk/mysql-4.0

myisam/ft_boolean_search.c

@@ -262,8 +262,14 @@ static void _ftb_init_index_search(FT_INFO *ftb)
       else
         reset_tree(& ftb->no_dupes);
     }
-    r=_mi_search(info, keyinfo, (uchar*) ftbw->word, ftbw->len,
-                              SEARCH_FIND | SEARCH_BIGGER, keyroot);
+    for (
+         r=_mi_search(info, keyinfo, (uchar*) ftbw->word, ftbw->len,
+                      SEARCH_FIND | SEARCH_BIGGER, keyroot) ;
+         !r && info->lastpos >= info->state->data_file_length;
+         r=_mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length,
+                           SEARCH_BIGGER, keyroot)
+        );
+
     if (!r)
     {
       r=_mi_compare_text(ftb->charset,
@@ -488,8 +494,13 @@ int ft_boolean_read_next(FT_INFO *ftb, char *record)
       _ftb_climb_the_tree(ftb, ftbw, 0);
 
       /* update queue */
-      r=_mi_search(info, keyinfo, (uchar*) ftbw->word, USE_WHOLE_KEY,
-                   SEARCH_BIGGER , keyroot);
+      for (
+          r=_mi_search(info, keyinfo, (uchar*) ftbw->word, USE_WHOLE_KEY,
+                       SEARCH_BIGGER, keyroot) ;
+           !r && info->lastpos >= info->state->data_file_length ;
+           r=_mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length,
+                             SEARCH_BIGGER, keyroot)
+          );
       if (!r)
       {
         r=_mi_compare_text(ftb->charset,

myisam/ft_nlq_search.c

@@ -85,8 +85,13 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
 
   doc_cnt=0;
 
-  r=_mi_search(aio->info, aio->keyinfo, aio->keybuff, keylen,
-	       SEARCH_FIND | SEARCH_PREFIX, aio->key_root);
+  for (
+      r=_mi_search(aio->info, aio->keyinfo, aio->keybuff, keylen,
+                   SEARCH_FIND | SEARCH_PREFIX, aio->key_root) ;
+       !r && aio->info->lastpos >= aio->info->state->data_file_length ;
+       r=_mi_search_next(aio->info, aio->keyinfo, aio->info->lastkey,
+                         aio->info->lastkey_length, SEARCH_BIGGER, aio->key_root)
+      );
   aio->info->update|= HA_STATE_AKTIV;  /* for _mi_test_if_changed() */
 
   while (!r && gweight)
@@ -132,6 +137,11 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
 	r=_mi_search(aio->info, aio->keyinfo, aio->info->lastkey,
 		     aio->info->lastkey_length, SEARCH_BIGGER,
 		     aio->key_root);
+
+    while (!r && aio->info->lastpos >= aio->info->state->data_file_length)
+	r=_mi_search(aio->info, aio->keyinfo, aio->info->lastkey,
+		     aio->info->lastkey_length, SEARCH_BIGGER,
+		     aio->key_root);
   }
 
   word->weight=gweight;