summaryrefslogtreecommitdiff
path: root/dbug/my_main.c
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 /dbug/my_main.c
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 'dbug/my_main.c')
-rw-r--r--dbug/my_main.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/dbug/my_main.c b/dbug/my_main.c
index d8bffe662e2..2b3e92b53cc 100644
--- a/dbug/my_main.c
+++ b/dbug/my_main.c
@@ -4,6 +4,7 @@
*/
#include <my_global.h> /* This includes dbug.h */
+#include <my_sys.h>
#include <my_pthread.h>
int main (argc, argv)
@@ -12,7 +13,7 @@ char *argv[];
{
register int result, ix;
extern int factorial(int);
- my_thread_global_init();
+ MY_INIT(argv[0]);
{
DBUG_ENTER ("main");
@@ -29,6 +30,8 @@ char *argv[];
result = factorial (atoi(argv[ix]));
printf ("%d\n", result);
}
- DBUG_RETURN (0);
+ DBUG_LEAVE;
}
+ my_end(0);
+ exit(0);
}