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/thr_lock.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/thr_lock.c')
| -rw-r--r-- | mysys/thr_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 61f18d9dddf..fdcdd29fc1a 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -1386,7 +1386,7 @@ void thr_downgrade_write_lock(THR_LOCK_DATA *in_data, enum thr_lock_type new_lock_type) { THR_LOCK *lock=in_data->lock; -#ifndef DBUG_OFF +#ifdef EXTRA_DEBUG enum thr_lock_type old_lock_type= in_data->type; #endif DBUG_ENTER("thr_downgrade_write_only_lock"); |