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/mi_open.c
View File

@@ -675,8 +675,11 @@ byte *mi_alloc_rec_buff(MI_INFO *info, ulong length, byte **buf)
/* to simplify initial init of info->rec_buf in mi_open and mi_extra */
if (length == (ulong) -1)
{
length= max(info->s->base.pack_reclength,
info->s->base.max_key_length);
if (info->s->options & HA_OPTION_COMPRESS_RECORD)
length= max(info->s->base.pack_reclength, info->s->max_pack_length);
else
length= info->s->base.pack_reclength;
length= max(length, info->s->base.max_key_length);
/* Avoid unnecessary realloc */
if (newptr && length == old_length)
return newptr;