diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 09:22:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 09:22:03 +0100 |
| commit | b728641e862df46b97616ce965cfa78ebf3f14aa (patch) | |
| tree | cd335135d6b576551a43147d1e220f47868700aa /storage/maria | |
| parent | 88d1c1c5514dc922699e69d64877b7788c74ffcc (diff) | |
| parent | 7bd258c44c00f232ecf4ec448179f114b878227b (diff) | |
| download | mariadb-git-b728641e862df46b97616ce965cfa78ebf3f14aa.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_dynrec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/maria/ma_dynrec.c b/storage/maria/ma_dynrec.c index 9fed9dbe8da..ffc42615258 100644 --- a/storage/maria/ma_dynrec.c +++ b/storage/maria/ma_dynrec.c @@ -276,7 +276,7 @@ my_bool _ma_update_blob_record(MARIA_HA *info, MARIA_RECORD_POS pos, { uchar *rec_buff; int error; - ulong reclength,extra; + ulong reclength,reclength2,extra; extra= (ALIGN_SIZE(MARIA_MAX_DYN_BLOCK_HEADER)+MARIA_SPLIT_LENGTH+ MARIA_DYN_DELETE_BLOCK_HEADER); @@ -289,17 +289,17 @@ my_bool _ma_update_blob_record(MARIA_HA *info, MARIA_RECORD_POS pos, return 1; } #endif - if (!(rec_buff=(uchar*) my_safe_alloca(reclength, - MARIA_MAX_RECORD_ON_STACK))) + if (!(rec_buff=(uchar*) my_safe_alloca(reclength, MARIA_MAX_RECORD_ON_STACK))) { my_errno= HA_ERR_OUT_OF_MEM; /* purecov: inspected */ return(1); } - reclength= _ma_rec_pack(info,rec_buff+ALIGN_SIZE(MARIA_MAX_DYN_BLOCK_HEADER), + reclength2= _ma_rec_pack(info,rec_buff+ALIGN_SIZE(MARIA_MAX_DYN_BLOCK_HEADER), record); + DBUG_ASSERT(reclength2 <= reclength); error=update_dynamic_record(info,pos, rec_buff+ALIGN_SIZE(MARIA_MAX_DYN_BLOCK_HEADER), - reclength); + reclength2); my_safe_afree(rec_buff, reclength, MARIA_MAX_RECORD_ON_STACK); return(error != 0); } |