Commit 92d7d668 authored by svoj@april.(none)'s avatar svoj@april.(none)

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

into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
parents 5f14652e c41bd446
...@@ -127,7 +127,6 @@ int main(int argc,char *argv[]) ...@@ -127,7 +127,6 @@ int main(int argc,char *argv[])
if (count || stats) if (count || stats)
{ {
doc_cnt++;
if (strcmp(buf, buf2)) if (strcmp(buf, buf2))
{ {
if (*buf2) if (*buf2)
...@@ -152,6 +151,7 @@ int main(int argc,char *argv[]) ...@@ -152,6 +151,7 @@ int main(int argc,char *argv[])
keylen2=keylen; keylen2=keylen;
doc_cnt=0; doc_cnt=0;
} }
doc_cnt+= (subkeys >= 0 ? 1 : -subkeys);
} }
if (dump) if (dump)
{ {
...@@ -167,7 +167,6 @@ int main(int argc,char *argv[]) ...@@ -167,7 +167,6 @@ int main(int argc,char *argv[])
if (count || stats) if (count || stats)
{ {
doc_cnt++;
if (*buf2) if (*buf2)
{ {
uniq++; uniq++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment