[Commits] Rev 3501: merge in file:///home/bell/maria/bzr/work-maria-10.0-merge/

sanja at askmonty.org sanja at askmonty.org
Mon Feb 4 17:30:46 EET 2013


At file:///home/bell/maria/bzr/work-maria-10.0-merge/

------------------------------------------------------------
revno: 3501 [merge]
revision-id: sanja at askmonty.org-20130204153039-ws7tcwfmbi6vil6e
parent: psergey at askmonty.org-20130204063831-32k5js0vubkhnvvy
parent: sanja at askmonty.org-20130204152510-6gvz4s23u7y4lkxt
committer: sanja at askmonty.org
branch nick: work-maria-10.0-merge
timestamp: Mon 2013-02-04 17:30:39 +0200
message:
  merge
modified:
  mysys/my_malloc.c              sp1f-my_malloc.c-19700101030959-b5g7zojw3fv3fwejfxqbdeooxki35e32
  sql/item_strfunc.h             sp1f-item_strfunc.h-19700101030959-x4djohef3q433aqvcrybhjmclafdu4sx
-------------- next part --------------
=== modified file 'mysys/my_malloc.c'
--- a/mysys/my_malloc.c	2013-01-23 15:23:50 +0000
+++ b/mysys/my_malloc.c	2013-02-04 10:47:57 +0000
@@ -185,7 +185,7 @@ void *my_realloc(void *oldpoint, size_t
       /* memory moved between system and thread specific */
       update_malloc_size(-(longlong) old_size - MALLOC_PREFIX_SIZE, old_flags);
       update_malloc_size((longlong) size + MALLOC_PREFIX_SIZE,
-                         my_flags & MY_THREAD_SPECIFIC);
+                         test(my_flags & MY_THREAD_SPECIFIC));
     }
     else
       update_malloc_size((longlong)size - (longlong)old_size, old_flags);

=== modified file 'sql/item_strfunc.h'
--- a/sql/item_strfunc.h	2013-01-29 14:10:47 +0000
+++ b/sql/item_strfunc.h	2013-02-04 15:25:10 +0000
@@ -1038,7 +1038,7 @@ public:
   String *val_str(String *);
   void fix_length_and_dec()
   {
-    maybe_null= TRUE;
+    set_persist_maybe_null(1);
     collation.set(&my_charset_bin);
     decimals= 0;
   }



More information about the commits mailing list