diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 16:24:47 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 16:24:47 +0200 |
| commit | 133b4b46fefde402542214d8226262534dc3601a (patch) | |
| tree | 51bbdc0ee35a4af61e5af6d97948963ae9354f39 /sql/item_func.cc | |
| parent | 44836bcd12e3974e79c928be747955bfb3b73910 (diff) | |
| parent | 533a13af069d8c9e6c5f4e1a72851497185ade03 (diff) | |
| download | mariadb-git-133b4b46fefde402542214d8226262534dc3601a.tar.gz | |
Merge 10.4 into 10.5
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 027488e0279..e133fead665 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4894,7 +4894,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; |