diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 14:12:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 14:12:02 +0100 |
| commit | a04e4f531a7d0574171cc49e42a8fbd289e9c6c1 (patch) | |
| tree | 4aa3df05611b76b1ed469c13037106cf264d1ba3 /storage/maria | |
| parent | 504beb132523511e93e91cc422bcd413ca556828 (diff) | |
| parent | b728641e862df46b97616ce965cfa78ebf3f14aa (diff) | |
| download | mariadb-git-a04e4f531a7d0574171cc49e42a8fbd289e9c6c1.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_dynrec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/maria/ma_dynrec.c b/storage/maria/ma_dynrec.c index 7f34b73089f..0234eb5fb7f 100644 --- a/storage/maria/ma_dynrec.c +++ b/storage/maria/ma_dynrec.c @@ -275,7 +275,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); @@ -293,11 +293,12 @@ my_bool _ma_update_blob_record(MARIA_HA *info, MARIA_RECORD_POS pos, 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); return(error != 0); } |