summaryrefslogtreecommitdiff
path: root/mysys/my_init.c
diff options
context:
space:
mode:
authorknielsen@mysql.com <>2006-05-15 18:07:18 +0200
committerknielsen@mysql.com <>2006-05-15 18:07:18 +0200
commitfc16aff7423eff1eb52fcd2522b3454fa8748c70 (patch)
treec90b581837f256bc8b3e0cb47cafcb159c99a19f /mysys/my_init.c
parentf071779791d2bae55a03a6f2e158907a1f40ae5e (diff)
downloadmariadb-git-fc16aff7423eff1eb52fcd2522b3454fa8748c70.tar.gz
Fix two Valgrind memory leak warnings.
Diffstat (limited to 'mysys/my_init.c')
-rw-r--r--mysys/my_init.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c
index c2bfdde0ddd..9b8d4db172f 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.c
@@ -196,8 +196,10 @@ Voluntary context switches %ld, Involuntary context switches %ld\n",
_CrtDumpMemoryLeaks();
#endif
}
+
+ if (!(infoflag & MY_DONT_FREE_DBUG))
+ DBUG_END(); /* Must be done before my_thread_end */
#ifdef THREAD
- DBUG_POP(); /* Must be done before my_thread_end */
my_thread_end();
my_thread_global_end();
#if defined(SAFE_MUTEX)