diff options
| author | unknown <msvensson@shellback.(none)> | 2006-10-03 01:01:06 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-10-03 01:01:06 +0200 |
| commit | 5d5ef8469aa40795bc65a9c6d6113c0a79f23401 (patch) | |
| tree | 22ec2d2557e7c8d0079e4bb86d7f2d65f579c004 /myisam | |
| parent | b2003316180f7c823368045d7ce115389900bd8a (diff) | |
| parent | e9275f4720de547b98a072bb64602f1097e6ba27 (diff) | |
| download | mariadb-git-5d5ef8469aa40795bc65a9c6d6113c0a79f23401.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
sql/item_func.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_delete.c | 2 | ||||
| -rw-r--r-- | myisam/myisam_ftdump.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/myisam/mi_delete.c b/myisam/mi_delete.c index 2bc99d65dd2..85cc60bdd9d 100644 --- a/myisam/mi_delete.c +++ b/myisam/mi_delete.c @@ -446,7 +446,7 @@ static int del(register MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *key, else { DBUG_PRINT("test",("Inserting of key when deleting")); - if (_mi_get_last_key(info,keyinfo,leaf_buff,keybuff,endpos, + if (!_mi_get_last_key(info,keyinfo,leaf_buff,keybuff,endpos, &tmp)) goto err; ret_value=_mi_insert(info,keyinfo,key,leaf_buff,endpos,keybuff, diff --git a/myisam/myisam_ftdump.c b/myisam/myisam_ftdump.c index 809d7bcca89..2be95d11714 100644 --- a/myisam/myisam_ftdump.c +++ b/myisam/myisam_ftdump.c @@ -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++; |