1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
unknown 2013-02-04 17:30:39 +02:00
commit 036ef7fe44
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/my_malloc.c
View File

@ -185,7 +185,7 @@ void *my_realloc(void *oldpoint, size_t size, myf my_flags)
/* memory moved between system and thread specific */ /* memory moved between system and thread specific */
update_malloc_size(-(longlong) old_size - MALLOC_PREFIX_SIZE, old_flags); update_malloc_size(-(longlong) old_size - MALLOC_PREFIX_SIZE, old_flags);
update_malloc_size((longlong) size + MALLOC_PREFIX_SIZE, update_malloc_size((longlong) size + MALLOC_PREFIX_SIZE,
my_flags & MY_THREAD_SPECIFIC); test(my_flags & MY_THREAD_SPECIFIC));
} }
else else
update_malloc_size((longlong)size - (longlong)old_size, old_flags); update_malloc_size((longlong)size - (longlong)old_size, old_flags);

2
sql/item_strfunc.h
View File

@ -1038,7 +1038,7 @@ public:
String *val_str(String *); String *val_str(String *);
void fix_length_and_dec() void fix_length_and_dec()
{ {
maybe_null= TRUE; set_persist_maybe_null(1);
collation.set(&my_charset_bin); collation.set(&my_charset_bin);
decimals= 0; decimals= 0;
} }