mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
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
This commit is contained in:
@@ -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[])
|
|||||||
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[])
|
|||||||
|
|
||||||
if (count || stats)
|
if (count || stats)
|
||||||
{
|
{
|
||||||
doc_cnt++;
|
|
||||||
if (*buf2)
|
if (*buf2)
|
||||||
{
|
{
|
||||||
uniq++;
|
uniq++;
|
||||||
|
Reference in New Issue
Block a user