diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 19:11:36 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 19:11:36 +0200 |
| commit | c498250888ec126fddda2867d1239b2a7734482f (patch) | |
| tree | e308174c977c0981d8e36f6f9b791b1b266d0cb0 /sql/field.cc | |
| parent | 09a1f0075a8d5752dd7b2940a20d86a040af1741 (diff) | |
| parent | 1418439d3823fe059b41092af72ab32d5e7cd7ab (diff) | |
| download | mariadb-git-10.6-vatu.tar.gz | |
Merge 10.5 into 10.6mariadb-10.5.7bb-10.6-georg10.6-vatu
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index f8d9cbf93ce..fe3aebce05d 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8724,7 +8724,10 @@ int Field_blob::cmp_binary(const uchar *a_ptr, const uchar *b_ptr, b_length=get_length(b_ptr); if (b_length > max_length) b_length=max_length; - diff=memcmp(a,b,MY_MIN(a_length,b_length)); + if (uint32 len= MY_MIN(a_length,b_length)) + diff= memcmp(a,b,len); + else + diff= 0; return diff ? diff : (int) (a_length - b_length); } @@ -8751,7 +8754,8 @@ uint Field_blob::get_key_image_itRAW(const uchar *ptr_arg, uchar *buff, length=(uint) blob_length; } int2store(buff,length); - memcpy(buff+HA_KEY_BLOB_LENGTH, blob, length); + if (length) + memcpy(buff+HA_KEY_BLOB_LENGTH, blob, length); return HA_KEY_BLOB_LENGTH+length; } |