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

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

myisam/ft_boolean_search.c

@@ -204,7 +204,7 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
 {
   int r;
   uint off;
-  int subkeys;
+  int subkeys=1;
   my_bool can_go_down;
   MI_INFO *info=ftb->info;
 
@@ -279,8 +279,6 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
 
   /* matching key found */
   memcpy(ftbw->word+ftbw->off, info->lastkey, info->lastkey_length);
-  if (!ftbw->off && (init_search || (ftbw->flags & FTB_FLAG_TRUNC)))
-  {
   /* going down ? */
   if (subkeys<0)
   {
@@ -295,7 +293,6 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
     DBUG_ASSERT(r==0);  /* found something */
     memcpy(ftbw->word+off, info->lastkey, info->lastkey_length);
   }
-  }
   ftbw->docid[0]=info->lastpos;
   return 0;
 }