diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-12-05 15:10:12 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-12-05 15:10:12 +0200 |
| commit | 6061a11d362499e386ecf391b86c0c084ea3d6cf (patch) | |
| tree | e2b315eb7e169fa3c7c4b3a1fd5998071fe2e652 /storage/maria/maria_pack.c | |
| parent | bafceea14f1bcc7edda379dcd874e21e2c173398 (diff) | |
| parent | a585745d4fd04c557a0d8f2fdacf10a35d77c8a3 (diff) | |
| download | mariadb-git-6061a11d362499e386ecf391b86c0c084ea3d6cf.tar.gz | |
merge with 5.1-release
Diffstat (limited to 'storage/maria/maria_pack.c')
| -rw-r--r-- | storage/maria/maria_pack.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/maria/maria_pack.c b/storage/maria/maria_pack.c index 5b1ec916248..983a38e69e7 100644 --- a/storage/maria/maria_pack.c +++ b/storage/maria/maria_pack.c @@ -690,6 +690,8 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table) error|=my_close(new_file,MYF(MY_WME)); if (!result_table) { + (void) flush_pagecache_blocks(isam_file->s->pagecache, &isam_file->dfile, + FLUSH_RELEASE); error|=my_close(isam_file->dfile.file, MYF(MY_WME)); isam_file->dfile.file= -1; /* Tell maria_close file is closed */ isam_file->s->bitmap.file.file= -1; @@ -763,13 +765,13 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table) DBUG_RETURN(0); err: - end_pagecache(maria_pagecache, 1); free_counts_and_tree_and_queue(huff_trees,trees,huff_counts,fields); if (new_file >= 0) VOID(my_close(new_file,MYF(0))); if (join_maria_file >= 0) VOID(my_close(join_maria_file,MYF(0))); mrg_close(mrg); + end_pagecache(maria_pagecache, 1); VOID(fprintf(stderr, "Aborted: %s is not compressed\n", org_name)); DBUG_RETURN(-1); } |