[Commits] Rev 3814: valgrind errors in gis.test and funcs_1.storedproc fixed. in file:///home/hf/wmar/10.0-serg/

holyfoot at askmonty.org holyfoot at askmonty.org
Sun Aug 4 22:31:28 EEST 2013


At file:///home/hf/wmar/10.0-serg/

------------------------------------------------------------
revno: 3814
revision-id: holyfoot at askmonty.org-20130804182111-1mj02zr3fh1oq2zy
parent: psergey at askmonty.org-20130802141435-18yhc3i155ct11de
committer: Alexey Botchkov <holyfoot at askmonty.org>
branch nick: 10.0-serg
timestamp: Sun 2013-08-04 23:21:11 +0500
message:
  valgrind errors in gis.test and funcs_1.storedproc fixed.
     Field_geom::store() should check if the source is it's value.
-------------- next part --------------
=== modified file 'sql/field.cc'
--- a/sql/field.cc	2013-07-21 14:39:19 +0000
+++ b/sql/field.cc	2013-08-04 18:21:11 +0000
@@ -7794,7 +7794,8 @@ int Field_geom::store(const char *from, 
     }
 
     Field_blob::store_length(length);
-    if (table->copy_blobs || length <= MAX_FIELD_WIDTH)
+    if ((table->copy_blobs || length <= MAX_FIELD_WIDTH) &&
+        from != value.ptr())
     {                                           // Must make a copy
       value.copy(from, length, cs);
       from= value.ptr();



More information about the commits mailing list