mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 09:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

MyISAM: always store alloced_rec_buff_length with the buffer itself

Browse source 
include/myisam.h:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_check.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_dynrec.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_extra.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_key.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_open.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/mi_packrec.c:
  always store alloced_rec_buff_length with the buffer itself
myisam/myisamdef.h:
  always store alloced_rec_buff_length with the buffer itself
This commit is contained in:
unknown 2002-07-26 14:42:51 +02:00
commit b0f2b107f9
8 changed files with 24 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

11
myisam/mi_dynrec.c
View file

@ -1060,8 +1060,7 @@ int _mi_read_dynamic_record(MI_INFO *info, my_off_t filepos, byte *buf)
if (info->s->base.blobs)
{
if (!(to=mi_alloc_rec_buff(info, block_info.rec_len,
&info->rec_buff,
&info->alloced_rec_buff_length)))
&info->rec_buff)))
goto err;
}
else
@ -1107,12 +1106,8 @@ int _mi_cmp_dynamic_unique(MI_INFO *info, MI_UNIQUEDEF *def,
/* Don't let the compare destroy blobs that may be in use */
rec_buff=info->rec_buff;
alloced_rec_buff_length=info->alloced_rec_buff_length;
if (info->s->base.blobs)
{
info->rec_buff=0;
info->alloced_rec_buff_length=0;
}
error=_mi_read_dynamic_record(info,pos,old_record);
if (!error)
error=mi_unique_comp(def, record, old_record, def->null_are_equal);
@ -1120,7 +1115,6 @@ int _mi_cmp_dynamic_unique(MI_INFO *info, MI_UNIQUEDEF *def,
{
my_free(mi_get_rec_buff_ptr(info, info->rec_buff), MYF(MY_ALLOW_ZERO_PTR));
info->rec_buff=rec_buff;
info->alloced_rec_buff_length=alloced_rec_buff_length;
}
my_afree(old_record);
DBUG_RETURN(error);
@ -1331,8 +1325,7 @@ int _mi_read_rnd_dynamic_record(MI_INFO *info, byte *buf,
if (share->base.blobs)
{
if (!(to= mi_alloc_rec_buff(info, block_info.rec_len,
&info->rec_buff,
&info->alloced_rec_buff_length)))
&info->rec_buff)))
goto err;
}
else