diff options
| author | unknown <rburnett@bk-internal.mysql.com> | 2006-05-18 17:24:29 +0200 |
|---|---|---|
| committer | unknown <rburnett@bk-internal.mysql.com> | 2006-05-18 17:24:29 +0200 |
| commit | 0aca1c398e8dfef023ff580f93edab16614611ec (patch) | |
| tree | 7b7d06310d27238dfd3d4ab6aceb49efe62279fa /mysys/my_init.c | |
| parent | af6fd42afa9c1e76562b488cc54bc2ea068f0d1c (diff) | |
| parent | fc57d850afde4deed73c0966cc1f39cd26092357 (diff) | |
| download | mariadb-git-0aca1c398e8dfef023ff580f93edab16614611ec.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/my_init.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
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 be08f615253..588bb6f46d6 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) |