database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-4.1-engines

Browse Source 
into  mysql.com:/home/svoj/devel/mysql/BUG31277/mysql-5.0-engines
This commit is contained in:
svoj@june.mysql.com
2007-11-14 14:38:26 +04:00
parent 7491e15f21 107822cf87
commit b4ad73d079
7 changed files with 107 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
myisam/myisamchk.c
View File

@@ -1543,8 +1543,8 @@ static int mi_sort_records(MI_CHECK *param,
mi_check_print_error(param,"Not enough memory for key block");
goto err;
}
if (!(sort_param.record=(byte*) my_malloc((uint) share->base.pack_reclength,
MYF(0))))
if (!mi_alloc_rec_buff(info, -1, &sort_param.record))
{
mi_check_print_error(param,"Not enough memory for record");
goto err;
@@ -1639,7 +1639,8 @@ err:
{
my_afree((gptr) temp_buff);
}
my_free(sort_param.record,MYF(MY_ALLOW_ZERO_PTR));
my_free(mi_get_rec_buff_ptr(info, sort_param.record),
MYF(MY_ALLOW_ZERO_PTR));
info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED);
VOID(end_io_cache(&info->rec_cache));
my_free(sort_info.buff,MYF(MY_ALLOW_ZERO_PTR));