diff options
| author | monty@mashka.mysql.fi <> | 2002-07-24 19:55:08 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-07-24 19:55:08 +0300 |
| commit | c702a1f8fda0814db36801b91c601329225f8030 (patch) | |
| tree | 31ee919bea7e4456572b62d5ea7302dc58bc0b6a /myisam/mi_packrec.c | |
| parent | 00089b8148dfc8b3e4cf2be94ec33fc51665f529 (diff) | |
| download | mariadb-git-c702a1f8fda0814db36801b91c601329225f8030.tar.gz | |
Removed wrong implementation of CUBE/ROLLUP
Fixed bugfix of INSERT ... SET db_name.table_name.column_name
Changed locking to external-locking
Fix client hangup for some invalid SQL queries.
Diffstat (limited to 'myisam/mi_packrec.c')
| -rw-r--r-- | myisam/mi_packrec.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c index d067fdc0fc5..07abde07644 100644 --- a/myisam/mi_packrec.c +++ b/myisam/mi_packrec.c @@ -1057,7 +1057,9 @@ uint _mi_pack_get_block_info(MI_INFO *myisam, MI_BLOCK_INFO *info, File file, info->blob_len=uint3korr(header+head_length+1); head_length+=4; } - if (!(mi_fix_rec_buff_for_blob(myisam,info->rec_len + info->blob_len))) + if (!(mi_alloc_rec_buff(myisam,info->rec_len + info->blob_len, + &myisam->rec_buff, + &myisam->alloced_rec_buff_length))) 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; @@ -1231,8 +1233,10 @@ static uchar *_mi_mempack_get_block_info(MI_INFO *myisam,MI_BLOCK_INFO *info, info->blob_len=uint3korr(header+1); header+=4; } - /* mi_fix_rec_buff_for_blob sets my_errno on error */ - if (!(mi_fix_rec_buff_for_blob(myisam,info->blob_len))) + /* 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))) return 0; /* not enough memory */ myisam->bit_buff.blob_pos=(uchar*) myisam->rec_buff; } |