diff options
| author | gluh@mysql.com/eagle.(none) <> | 2007-02-01 18:00:24 +0400 |
|---|---|---|
| committer | gluh@mysql.com/eagle.(none) <> | 2007-02-01 18:00:24 +0400 |
| commit | 010dc0b55c1255b75ca6ddd1bd058c157624b9df (patch) | |
| tree | 377c350f251e9ea221dc51f671e25b865691db6d /sql/field_conv.cc | |
| parent | 658777d8080a500918c3b5815cdafbf0e746c1e7 (diff) | |
| download | mariadb-git-010dc0b55c1255b75ca6ddd1bd058c157624b9df.tar.gz | |
Valgrind error fixes
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index d61b3735c91..59b550572c3 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -605,6 +605,10 @@ void field_conv(Field *to,Field *from) from->charset() == to->charset() && to->table->db_low_byte_first == from->table->db_low_byte_first) { // Identical fields +#ifdef HAVE_purify + /* This may happen if one does 'UPDATE ... SET x=x' */ + if (to->ptr != from->ptr) +#endif memcpy(to->ptr,from->ptr,to->pack_length()); return; } |