1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)

Browse Source
This commit is contained in:
unknown 2003-11-19 23:07:31 +01:00
parent a36145a8f2
commit 8fcd731179
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
myisam/mi_check.c
View File

@ -1368,6 +1368,7 @@ err:
VOID(my_close(new_file,MYF(0))); VOID(my_close(new_file,MYF(0)));
VOID(my_raid_delete(param->temp_filename,info->s->base.raid_chunks, VOID(my_raid_delete(param->temp_filename,info->s->base.raid_chunks,
MYF(MY_WME))); MYF(MY_WME)));
info->rec_cache.file=-1; /* don't flush data to new_file, it's closed */
} }
mi_mark_crashed_on_repair(info); 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, if (!(to=mi_alloc_rec_buff(info,block_info.rec_len,
&(sort_param->rec_buff)))) &(sort_param->rec_buff))))
{ {
mi_check_print_error(param,"Not enough memory for blob at %s", mi_check_print_error(param,"Not enough memory for blob at %s (need %lu)",
llstr(sort_param->start_recpos,llbuff)); llstr(sort_param->start_recpos,llbuff), block_info.rec_len);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
} }