diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-27 20:55:21 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-27 20:55:21 +0200 |
| commit | e6f5fc1c02bfbfde6322fb44d108e6de60b4f92f (patch) | |
| tree | 7a525620be52c9cfcc27be5430371e5b711cf464 /mysys/my_init.c | |
| parent | e72a6096f29a82081bffdd1b5f9fd4b322478457 (diff) | |
| download | mariadb-git-e6f5fc1c02bfbfde6322fb44d108e6de60b4f92f.tar.gz | |
Fixed lp:909051 Options --debug and --disable-debug are known but ambiguous in RelWithDebInfo build
Fixed memory leak printing when doing 'mysqld --version', 'mysqld --debug --help' and 'mysqld --debug --help --verbose'
mysys/my_init.c:
Moved checking if we should call DBUG_END() before my_thread_end() as otherwise we will not free DBUG variables and files.
mysys/thr_lock.c:
Fixed compiler warning
sql/mysqld.cc:
Fixed memory leaks when using mysqld --help and mysqld --version
Added --debug as an option that works for all builds. For non debug builds we now get a warning.
strings/dtoa.c:
Fixed valgrind warning (c could contain data outside of the given string)
Diffstat (limited to 'mysys/my_init.c')
| -rw-r--r-- | mysys/my_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index 9e437162633..6a56396bd5a 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -199,6 +199,9 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", #endif } + if (!(infoflag & MY_DONT_FREE_DBUG)) + DBUG_END(); /* Must be done as late as possible */ + my_thread_end(); my_thread_global_end(); my_mutex_end(); @@ -216,9 +219,6 @@ Voluntary context switches %ld, Involuntary context switches %ld\n", WSACleanup(); #endif /* __WIN__ */ - if (!(infoflag & MY_DONT_FREE_DBUG)) - DBUG_END(); /* Must be done as late as possible */ - my_init_done=0; } /* my_end */ |