diff options
| author | serg@sergbook.mysql.com <> | 2002-07-26 14:42:51 +0200 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2002-07-26 14:42:51 +0200 |
| commit | 43ef1198e9d21b5f98380528209aa23a500810c0 (patch) | |
| tree | 0ec06db644f83dcda914d46e0e1ecad40ea13ab4 /myisam/mi_packrec.c | |
| parent | 5d978447b237da19f4be21eaab31da1572792536 (diff) | |
| download | mariadb-git-43ef1198e9d21b5f98380528209aa23a500810c0.tar.gz | |
MyISAM: always store alloced_rec_buff_length with the buffer itself
Diffstat (limited to 'myisam/mi_packrec.c')
| -rw-r--r-- | myisam/mi_packrec.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c index 07abde07644..818788a5e74 100644 --- a/myisam/mi_packrec.c +++ b/myisam/mi_packrec.c @@ -1058,8 +1058,7 @@ uint _mi_pack_get_block_info(MI_INFO *myisam, MI_BLOCK_INFO *info, File file, head_length+=4; } if (!(mi_alloc_rec_buff(myisam,info->rec_len + info->blob_len, - &myisam->rec_buff, - &myisam->alloced_rec_buff_length))) + &myisam->rec_buff))) return BLOCK_FATAL_ERROR; /* not enough memory */ myisam->bit_buff.blob_pos=(uchar*) myisam->rec_buff+info->rec_len; myisam->blob_length=info->blob_len; @@ -1235,8 +1234,7 @@ static uchar *_mi_mempack_get_block_info(MI_INFO *myisam,MI_BLOCK_INFO *info, } /* mi_alloc_rec_buff sets my_errno on error */ if (!(mi_alloc_rec_buff(myisam, info->blob_len, - &myisam->rec_buff, - &myisam->alloced_rec_buff_length))) + &myisam->rec_buff))) return 0; /* not enough memory */ myisam->bit_buff.blob_pos=(uchar*) myisam->rec_buff; } |