diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 19:55:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 19:55:54 +0200 |
| commit | 172f5e28ba9efceb3d3cee40c8373d2ee66f7c7a (patch) | |
| tree | 2699ed6525a405595de40da2ec5e31793ee63f16 /mysys/my_alloc.c | |
| parent | 02b8232629807ca3e37b99489f8191c549f7569a (diff) | |
| download | mariadb-git-172f5e28ba9efceb3d3cee40c8373d2ee66f7c7a.tar.gz | |
add safemalloc back
... but differently
client/mysqltest.cc:
my_safe_print_str() don't append \n anymore
dbug/dbug.c:
restore safemalloc as a part of dbug suite
dbug/user.r:
restore 'S' flag documentation
include/my_dbug.h:
restore safemalloc as a part of dbug suite
include/my_sys.h:
move valgrind defines to a dedicated header
mysys/my_malloc.c:
use new safemalloc
mysys/stacktrace.c:
don't append \n. let the calller do it, if needed
sql/mysqld.cc:
my_safe_print_str() don't append \n anymore
Diffstat (limited to 'mysys/my_alloc.c')
| -rw-r--r-- | mysys/my_alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c index eb3fb7941bf..923e00d2182 100644 --- a/mysys/my_alloc.c +++ b/mysys/my_alloc.c @@ -235,6 +235,7 @@ void *alloc_root(MEM_ROOT *mem_root, size_t length) mem_root->used= next; mem_root->first_block_usage= 0; } + TRASH_ALLOC(point, length); DBUG_PRINT("exit",("ptr: 0x%lx", (ulong) point)); DBUG_RETURN((void*) point); #endif |