merge

2 files changed, 2 insertions, 2 deletions

diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index 8d1a3d926d6..5a84b051a23 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.c
@@ -185,7 +185,7 @@ void *my_realloc(void *oldpoint, size_t size, myf my_flags)
       /* 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);
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
index a42240f1b35..486b7cf36ef 100644
--- a/sql/item_strfunc.h
+++ b/sql/item_strfunc.h
@@ -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;
   }