Commit ffa4a1e0 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines 

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines


storage/myisam/myisam_ftdump.c:
  Auto merged
parents 07ef7461 f7316a9e

storage/myisam/myisam_ftdump.c

+1 −2
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ int main(int argc,char *argv[]) 


    if (count || stats)

    {

      doc_cnt++;

      if (strcmp(buf, buf2))

      {

        if (*buf2)
@@ -152,6 +151,7 @@ int main(int argc,char *argv[]) 
        keylen2=keylen;

        doc_cnt=0;

      }

      doc_cnt+= (subkeys >= 0 ? 1 : -subkeys);

    }

    if (dump)

    {
@@ -167,7 +167,6 @@ int main(int argc,char *argv[]) 


  if (count || stats)

  {

    doc_cnt++;

    if (*buf2)

    {

      uniq++;