diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 15:48:47 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-02 15:48:47 +0200 |
commit | c7f322c91faf97a9f758c288b38e1385fd89b32d (patch) | |
tree | cf2a4cf562acffdf5b4b96d84e34f29c7f428458 /sql/item_func.cc | |
parent | d5ce7824444b7491f420061076ae5087d4829428 (diff) | |
parent | 8036d0a3590dddf4d51ba02bc74ba3a5a96674f7 (diff) | |
download | mariadb-git-c7f322c91faf97a9f758c288b38e1385fd89b32d.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 0c22d4ce23c..a6d9ecc1d2f 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4725,7 +4725,8 @@ update_hash(user_var_entry *entry, bool set_null, void *ptr, size_t length, length--; // Fix length change above entry->value[length]= 0; // Store end \0 } - memmove(entry->value, ptr, length); + if (length) + memmove(entry->value, ptr, length); if (type == DECIMAL_RESULT) ((my_decimal*)entry->value)->fix_buffer_pointer(); entry->length= length; |