mirror of
https://github.com/MariaDB/server.git
synced 2026-05-06 15:15:34 +02:00
Auto-merge with mysql-5.5-bugteam.
This commit is contained in:
commit
fb8a31caaf
52 changed files with 2445 additions and 5075 deletions
|
|
@ -4331,7 +4331,7 @@ update_hash(user_var_entry *entry, bool set_null, void *ptr, uint length,
|
|||
length--; // Fix length change above
|
||||
entry->value[length]= 0; // Store end \0
|
||||
}
|
||||
memcpy(entry->value,ptr,length);
|
||||
memmove(entry->value, ptr, length);
|
||||
if (type == DECIMAL_RESULT)
|
||||
((my_decimal*)entry->value)->fix_buffer_pointer();
|
||||
entry->length= length;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue