diff options
| author | unknown <msvensson@shellback.(none)> | 2006-10-03 00:58:13 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-10-03 00:58:13 +0200 |
| commit | e9275f4720de547b98a072bb64602f1097e6ba27 (patch) | |
| tree | e14390be8fd83f59ec14c5d1d8d8fb5fe4c5c5df /myisam | |
| parent | 47424c154792a548db22e8616ef127e981071c4a (diff) | |
| parent | 84000c374b5e4e2fa61a11481bf65a87f0b123a1 (diff) | |
| download | mariadb-git-e9275f4720de547b98a072bb64602f1097e6ba27.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into shellback.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 9 | ||||
| -rw-r--r-- | myisam/mi_delete.c | 2 | ||||
| -rw-r--r-- | myisam/myisam_ftdump.c | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index a3195ebce7f..5a81d221d2a 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1370,7 +1370,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, param->temp_filename); goto err; } - if (filecopy(param,new_file,info->dfile,0L,new_header_length, + if (new_header_length && + filecopy(param,new_file,info->dfile,0L,new_header_length, "datafile-header")) goto err; info->s->state.dellink= HA_OFFSET_ERROR; @@ -2072,7 +2073,8 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, param->temp_filename); goto err; } - if (filecopy(param, new_file,info->dfile,0L,new_header_length, + if (new_header_length && + filecopy(param, new_file,info->dfile,0L,new_header_length, "datafile-header")) goto err; if (param->testflag & T_UNPACK) @@ -2440,7 +2442,8 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, param->temp_filename); goto err; } - if (filecopy(param, new_file,info->dfile,0L,new_header_length, + if (new_header_length && + filecopy(param, new_file,info->dfile,0L,new_header_length, "datafile-header")) goto err; if (param->testflag & T_UNPACK) 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++; |