From 330d3a7d1f29e57da867b0ab2b138e5e95fb4415 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 4 Feb 2013 11:47:57 +0100 Subject: missing cast added --- mysys/my_malloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.1 From 1f85b1e069de59d9fbb9111624a3957a489c0afc Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 Feb 2013 17:25:10 +0200 Subject: MDEV-3873: post-merge fix. --- sql/item_strfunc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v1.2.1