bk commit into 5.0 tree (svoj:1.2277) BUG#21459

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj 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@stripped, 2006-09-20 17:12:37+05:00, svoj@stripped +1 -0
  BUG#21459 - myisam_ftdump gives bad counts for common words
  
  This problem affects myisam_ftdump tool only.
  
  For fulltext index positive subkeys means word weight, negative subkeys
  means number of documents in level 2 fulltext index.
  
  Fixed that document counter was not properly updated for keys having
  level 2 fulltext index.
  
  No test case for this bug.

  myisam/myisam_ftdump.c@stripped, 2006-09-20 17:12:35+05:00, svoj@stripped +1 -2
    For fulltext index positive subkeys means word weight, negative subkeys
    means number of documents in level 2 fulltext index.
    
    Fixed that document counter was not properly updated for keys having
    level 2 fulltext index.

# 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:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG21459/mysql-5.0-engines

--- 1.38/myisam/myisam_ftdump.c	2006-09-20 17:12:42 +05:00
+++ 1.39/myisam/myisam_ftdump.c	2006-09-20 17:12:42 +05:00
@@ -126,7 +126,6 @@ int main(int argc,char *argv[])
 
     if (count || stats)
     {
-      doc_cnt++;
       if (strcmp(buf, buf2))
       {
         if (*buf2)
@@ -151,6 +150,7 @@ int main(int argc,char *argv[])
         keylen2=keylen;
         doc_cnt=0;
       }
+      doc_cnt+= (subkeys >= 0 ? 1 : -subkeys);
     }
     if (dump)
     {
@@ -166,7 +166,6 @@ int main(int argc,char *argv[])
 
   if (count || stats)
   {
-    doc_cnt++;
     if (*buf2)
     {
       uniq++;