summaryrefslogtreecommitdiff
path: root/dbug
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2009-03-22 14:16:09 +0200
committerMichael Widenius <monty@askmonty.org>2009-03-22 14:16:09 +0200
commit46db8aac44737fc9b8b07283140c6d0add4d1789 (patch)
treeba0081fdba288f6a0a7e37d4cca041bc92cbdfdf /dbug
parent806ec1b06206bb4f1ee41087b09c475be67d449d (diff)
downloadmariadb-git-46db8aac44737fc9b8b07283140c6d0add4d1789.tar.gz
Apply patch by Antony Dovgal:
- Move SAFE_MUTEX to be stored in config.h by configure.in (not as a flag used with compiler command line) - Generate my_config.h in configure BUILD/SETUP.sh: Remove -DSAFE_MUTEX as the following --with-debug flag will automaticly add it BUILD/compile-ia64-debug-max: Remove -DSAFE_MUTEX as the following --with-debug flag will automaticly add it configure.in: Move SAFE_MUTEX and SAFE_MALLOC to [my_] config.h Generate my_config.h as part of configure process dbug/dbug.c: Include my_global.h before we undef SAFE_MUTEX include/Makefile.am: Update comment. For now, lets generate my_config.h if someone deletes it after configure mysys/my_wincond.c: Include my_global.h before we undef SAFE_MUTEX mysys/my_winthread.c: Include my_global.h before we undef SAFE_MUTEX
Diffstat (limited to 'dbug')
-rw-r--r--dbug/dbug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c
index a3f2284f49c..79d58d715f8 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -84,8 +84,8 @@
in pthread_mutex_lock
*/
-#undef SAFE_MUTEX
#include <my_global.h>
+#undef SAFE_MUTEX
#include <m_string.h>
#include <errno.h>