diff options
| author | unknown <monty@mysql.com> | 2005-05-20 16:14:35 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-05-20 16:14:35 +0300 |
| commit | 027c10f3bbc5ad54a104909f5587effe246d7ed5 (patch) | |
| tree | aa7fb9173589000beb4052d77262a95532b07c2e /sql/field_conv.cc | |
| parent | 3034935a875d959c21af79d08fbda2a1d32f11c6 (diff) | |
| download | mariadb-git-027c10f3bbc5ad54a104909f5587effe246d7ed5.tar.gz | |
compatibility issues
Fixed errors reported by valgrind (some errors in NDB remains)
myisam/rt_split.c:
Added missing cast that caused problem on novell
(minor code cleanup)
ndb/src/ndbapi/Ndb.cpp:
Moved DBUG_ENTER to remove warning from DBUG library
sql/field_conv.cc:
Added test for valgrind/purify to avoid warning
sql/item_sum.cc:
Removed comment and added ASSERT as setup can't be called twice anymore
sql/sql_delete.cc:
Fixed wrong return value
sql/sql_parse.cc:
More debugging
sql/sql_select.cc:
Removed duplicate call to setup() which caused a memory leak
strings/my_vsnprintf.c:
Added support for '%c' (used when printing my_getopt errors)
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index ae784ae0293..15598e59bb9 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -605,7 +605,11 @@ void field_conv(Field *to,Field *from) to->type() != FIELD_TYPE_DATE && to->type() != FIELD_TYPE_DATETIME)) { // Identical fields - memcpy(to->ptr,from->ptr,to->pack_length()); +#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; } } |