diff options
author | knielsen@mysql.com <> | 2006-05-16 14:34:35 +0200 |
---|---|---|
committer | knielsen@mysql.com <> | 2006-05-16 14:34:35 +0200 |
commit | a729d7fcdd8c8458bb0a211923521be9eda9f694 (patch) | |
tree | 08fb4ce18ad7defbb710e90b6e9b2c7cccc3eabf /mysys/my_init.c | |
parent | 2abf957c911e658e0eed202c34bb0b6b915bc79a (diff) | |
parent | fc16aff7423eff1eb52fcd2522b3454fa8748c70 (diff) | |
download | mariadb-git-a729d7fcdd8c8458bb0a211923521be9eda9f694.tar.gz |
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
into mysql.com:/usr/local/mysql/tmp-5.1
Diffstat (limited to 'mysys/my_init.c')
-rw-r--r-- | mysys/my_init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 4d7299c7cb1..9efe0a0c20e 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -197,8 +197,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) |