diff options
| author | unknown <knielsen@mysql.com> | 2006-05-16 14:34:35 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-16 14:34:35 +0200 |
| commit | 771d3d822955e28c58b4384524938ba9162ec5ab (patch) | |
| tree | 08fb4ce18ad7defbb710e90b6e9b2c7cccc3eabf /mysys/my_init.c | |
| parent | 39b5c0f50dadd8d2018bd4252e9b748a708675dd (diff) | |
| parent | a046322b4e61aaef3db9efc9e85477792085c453 (diff) | |
| download | mariadb-git-771d3d822955e28c58b4384524938ba9162ec5ab.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
into mysql.com:/usr/local/mysql/tmp-5.1
client/mysqlbinlog.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/my_init.c:
Auto merged
sql/mysqld.cc:
Auto merged
dbug/dbug.c:
Manual merge
include/my_dbug.h:
Manual merge
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) |