diff options
| author | unknown <serg@serg.mylan> | 2003-11-19 23:07:31 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-11-19 23:07:31 +0100 |
| commit | 8fcd7311790f548cff66d40ef24b5bc02d61a6e8 (patch) | |
| tree | 6b8546b2adfb7eb581464ed8ae88c5dc0cf53acd /myisam | |
| parent | a36145a8f2ba164bffe513c887697548b38955df (diff) | |
| download | mariadb-git-8fcd7311790f548cff66d40ef24b5bc02d61a6e8.tar.gz | |
minor fixups: more verbose on "no memory" errors - report requested size, avoid flushing rec buffer to a file that is closed and deleted already (on got_error=1)
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 466defe8fbc..7108fdcba9e 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1368,6 +1368,7 @@ err: VOID(my_close(new_file,MYF(0))); VOID(my_raid_delete(param->temp_filename,info->s->base.raid_chunks, MYF(MY_WME))); + info->rec_cache.file=-1; /* don't flush data to new_file, it's closed */ } mi_mark_crashed_on_repair(info); } @@ -2852,8 +2853,8 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param) if (!(to=mi_alloc_rec_buff(info,block_info.rec_len, &(sort_param->rec_buff)))) { - mi_check_print_error(param,"Not enough memory for blob at %s", - llstr(sort_param->start_recpos,llbuff)); + mi_check_print_error(param,"Not enough memory for blob at %s (need %lu)", + llstr(sort_param->start_recpos,llbuff), block_info.rec_len); DBUG_RETURN(1); } } |