diff options
| author | unknown <knielsen@mysql.com> | 2006-05-15 19:57:12 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-15 19:57:12 +0200 |
| commit | 167d54cd63795a91b4e9b10226504b632c3b33b7 (patch) | |
| tree | 86fbbc9dc5f8d1552d45198060c66f8612a4ff9b /mysys | |
| parent | f3be3b6a91aa8ac631a8ff40e49756bd9200b374 (diff) | |
| parent | a046322b4e61aaef3db9efc9e85477792085c453 (diff) | |
| download | mariadb-git-167d54cd63795a91b4e9b10226504b632c3b33b7.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
into mysql.com:/usr/local/mysql/tmp-5.0
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysys')
| -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 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) |