diff options
| author | dkatz@damien-katzs-computer.local <> | 2007-05-17 16:18:35 -0400 |
|---|---|---|
| committer | dkatz@damien-katzs-computer.local <> | 2007-05-17 16:18:35 -0400 |
| commit | da10c5dd0b07f7719c6139a6d9e720882bf20aad (patch) | |
| tree | 9c1c66ea7c2ab86abfa2258eb9e99ce2f6bb261d /storage/myisam | |
| parent | 8406164e7e78e23ca354bf5fd6342e83227fb73d (diff) | |
| parent | c21c22d85ff5bf72089cf06792843cd9e2726ead (diff) | |
| download | mariadb-git-da10c5dd0b07f7719c6139a6d9e720882bf20aad.tar.gz | |
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into damien-katzs-computer.local:/Users/dkatz/mysql51
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/sort.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c index 9d2219cd1fe..1d4d15c7b25 100644 --- a/storage/myisam/sort.c +++ b/storage/myisam/sort.c @@ -773,7 +773,7 @@ static int NEAR_F merge_many_buff(MI_SORT_PARAM *info, uint keys, { if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++, buffpek+i,buffpek+i+MERGEBUFF-1)) - break; /* purecov: inspected */ + goto cleanup; } if (merge_buffers(info,keys,from_file,to_file,sort_keys,lastbuff++, buffpek+i,buffpek+ *maxbuffer)) @@ -783,6 +783,7 @@ static int NEAR_F merge_many_buff(MI_SORT_PARAM *info, uint keys, temp=from_file; from_file=to_file; to_file=temp; *maxbuffer= (int) (lastbuff-buffpek)-1; } +cleanup: close_cached_file(to_file); /* This holds old result */ if (to_file == t_file) *t_file=t_file2; /* Copy result file */ |