summaryrefslogtreecommitdiff
path: root/mysys/mysys_priv.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-12-12 22:58:24 +0100
committerSergei Golubchik <sergii@pisem.net>2011-12-12 22:58:24 +0100
commit6cc9d0ffa0b6d9d0f19cf9445fad0e0ba11e38f8 (patch)
tree6952bb89985c14f7ad5e362dd350d191cadd0d69 /mysys/mysys_priv.h
parent37c81d81b3940a21b500aff6aeb70e8b1df0b7e8 (diff)
downloadmariadb-git-6cc9d0ffa0b6d9d0f19cf9445fad0e0ba11e38f8.tar.gz
move safemalloc out of dbug.
remeber a real backtrace for every allocation. make safemalloc to tract C++ new/delete too. collateral fixes to make the test suite pass.
Diffstat (limited to 'mysys/mysys_priv.h')
-rw-r--r--mysys/mysys_priv.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h
index 2c0c8bf82f8..f5d2f301837 100644
--- a/mysys/mysys_priv.h
+++ b/mysys/mysys_priv.h
@@ -69,6 +69,15 @@ extern PSI_file_key key_file_proc_meminfo;
extern PSI_file_key key_file_charset, key_file_cnf;
#endif /* HAVE_PSI_INTERFACE */
+#ifdef SAFEMALLOC
+void *sf_malloc(size_t size);
+void *sf_realloc(void *ptr, size_t size);
+void sf_free(void *ptr);
+#else
+#define sf_malloc(X) malloc(X)
+#define sf_realloc(X,Y) realloc(X,Y)
+#define sf_free(X) free(X)
+#endif
/*
EDQUOT is used only in 3 C files only in mysys/. If it does not exist on