diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2010-11-23 16:08:10 +0300 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2010-11-23 16:08:10 +0300 |
| commit | 55114ee20cf75d95034ef4d775ccfdb37f6a3155 (patch) | |
| tree | 456df7f95251f341692a64e136d74a55a933c52e /sql/item_func.cc | |
| parent | 65f940024a34120642e9171b41c8d229b2c94274 (diff) | |
| parent | cf0cc723aaa08bf6929c3b0bb0ccd3fdca626af0 (diff) | |
| download | mariadb-git-55114ee20cf75d95034ef4d775ccfdb37f6a3155.tar.gz | |
Auto-merge with mysql-5.1-bugteam.
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index f8c6f48d8f5..8bb1009ac2c 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3924,7 +3924,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; |