Merge work:/home/bk/mysql-4.0

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

Docs/manual.texi

@@ -33523,7 +33523,7 @@ The different table types are:
 @item ISAM @tab The original table handler. @xref{ISAM}.
 @item InnoDB @tab Transaction-safe tables with row locking. @xref{InnoDB}.
 @item MERGE @tab A collection of MyISAM tables used as one table. @xref{MERGE}.
-@item MRG_MERGE @tab An alias for MERGE tables
+@item MRG_MyISAM @tab An alias for MERGE tables
 @item MyISAM @tab The new binary portable table handler that is replacing ISAM. @xref{MyISAM}.
 @end multitable
 @xref{Table types}.

myisam/ft_parser.c

@@ -167,8 +167,8 @@ byte ft_get_word(byte **start, byte *end, FT_WORD *word, FTB_PARAM *param)
     if ((param->trunc=(doc<end && *doc == FTB_TRUNC)))
       doc++;
 
-    if (word->len >= ft_min_word_len && word->len < ft_max_word_len &&
-        !is_stopword(word->pos, word->len))
+    if (((word->len >= ft_min_word_len && !is_stopword(word->pos, word->len))
+         || param->trunc) && word->len < ft_max_word_len)
     {
       *start=doc;
       return 1;