diff options
| author | unknown <serg@sergbook.mysql.com> | 2002-07-26 16:01:04 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2002-07-26 16:01:04 +0200 |
| commit | 826a23b2ef2cc4d7188603081bc99d7a38c351d6 (patch) | |
| tree | 639fd48491987f3a7b2fa6bcbcf4c18b02c287c1 /myisam/mi_check.c | |
| parent | 8100e95ef77a7d7a739e1f234b39467b9f6bd652 (diff) | |
| download | mariadb-git-826a23b2ef2cc4d7188603081bc99d7a38c351d6.tar.gz | |
mi_repair* functions need a separate rec_buff :(
Diffstat (limited to 'myisam/mi_check.c')
| -rw-r--r-- | myisam/mi_check.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 0ac0917e8cd..15c9a5ad9de 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1144,7 +1144,6 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, MYF(MY_WME | MY_WAIT_IF_FULL))) goto err; info->opt_flag|=WRITE_CACHE_USED; - sort_param.rec_buff=info->rec_buff; if (!(sort_param.record=(byte*) my_malloc((uint) share->base.pack_reclength, MYF(0)))) { @@ -1343,6 +1342,8 @@ err: } mi_mark_crashed_on_repair(info); } + my_free(mi_get_rec_buff_ptr(info, sort_param.rec_buff), + MYF(MY_ALLOW_ZERO_PTR)); my_free(sort_param.record,MYF(MY_ALLOW_ZERO_PTR)); my_free(sort_info.buff,MYF(MY_ALLOW_ZERO_PTR)); VOID(end_io_cache(¶m->read_cache)); @@ -1807,7 +1808,6 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, info->opt_flag|=WRITE_CACHE_USED; info->rec_cache.file=info->dfile; /* for sort_delete_record */ - sort_param.rec_buff=info->rec_buff; if (!(sort_param.record=(byte*) my_malloc((uint) share->base.pack_reclength, MYF(0)))) { @@ -2087,8 +2087,10 @@ err: share->state.changed&= ~STATE_NOT_OPTIMIZED_KEYS; share->state.changed|=STATE_NOT_SORTED_PAGES; - my_free((gptr) sort_info.key_block,MYF(MY_ALLOW_ZERO_PTR)); + my_free(mi_get_rec_buff_ptr(info, sort_param.rec_buff), + MYF(MY_ALLOW_ZERO_PTR)); my_free(sort_param.record,MYF(MY_ALLOW_ZERO_PTR)); + my_free((gptr) sort_info.key_block,MYF(MY_ALLOW_ZERO_PTR)); my_free(sort_info.buff,MYF(MY_ALLOW_ZERO_PTR)); VOID(end_io_cache(¶m->read_cache)); info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED); |