diff options
| author | unknown <svoj@april.(none)> | 2006-09-27 15:29:04 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-09-27 15:29:04 +0500 |
| commit | ffa4a1e05ae6ecb2951bfdd117bf6df404834f7c (patch) | |
| tree | 806107e5548433b0d53c72973de85212e9853913 /storage/myisam/myisam_ftdump.c | |
| parent | 07ef7461a0f859601784a94b1014ce66e7a6a528 (diff) | |
| parent | f7316a9eb86e580d7218fa34396150c87ebae910 (diff) | |
| download | mariadb-git-ffa4a1e05ae6ecb2951bfdd117bf6df404834f7c.tar.gz | |
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
Diffstat (limited to 'storage/myisam/myisam_ftdump.c')
| -rw-r--r-- | storage/myisam/myisam_ftdump.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/myisam/myisam_ftdump.c b/storage/myisam/myisam_ftdump.c index 209ef49c8db..46d0ffd13a5 100644 --- a/storage/myisam/myisam_ftdump.c +++ b/storage/myisam/myisam_ftdump.c @@ -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++; |