diff options
| author | unknown <msvensson@maint1.mysql.com> | 2006-07-20 14:11:37 +0200 |
|---|---|---|
| committer | unknown <msvensson@maint1.mysql.com> | 2006-07-20 14:11:37 +0200 |
| commit | a9102767a38a1e227e1aa48a78431dad9ea05542 (patch) | |
| tree | a71edf125ceac7706a8342dcb80a002aeffbbe3f | |
| parent | 63a098f364df4e8d53e447e70ff4ad576c1f8c04 (diff) | |
| parent | d93ec9ee84de8b1c37fa0996a4c6ef6d2f94e033 (diff) | |
| download | mariadb-git-a9102767a38a1e227e1aa48a78431dad9ea05542.tar.gz | |
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/my50-bug19517
into maint1.mysql.com:/data/localhome/msvensson/my50-bug19517
configure.in:
Auto merged
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | dbug/dbug.c | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/configure.in b/configure.in index cf3d7b72040..d4ee825a47f 100644 --- a/configure.in +++ b/configure.in @@ -1655,17 +1655,20 @@ AC_ARG_WITH(debug, if test "$with_debug" = "yes" then # Medium debug. - CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DDBUG_ON -DSAFE_MUTEX $CXXFLAGS" + AC_DEFINE([DBUG_ON], [1], [Use libdbug]) + CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS" elif test "$with_debug" = "full" then # Full debug. Very slow in some cases - CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" + AC_DEFINE([DBUG_ON], [1], [Use libdbug]) + CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" else # Optimized version. No debug - CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS" - CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS" + AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug]) + CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS" + CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS" fi # Force static compilation to avoid linking problems/get more speed diff --git a/dbug/dbug.c b/dbug/dbug.c index c991daf3617..575481305e7 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -66,10 +66,13 @@ * Check of malloc on entry/exit (option "S") */ +#include <my_global.h> + +/* This file won't compile unless DBUG_OFF is undefined locally */ #ifdef DBUG_OFF #undef DBUG_OFF #endif -#include <my_global.h> + #include <m_string.h> #include <errno.h> #if defined(MSDOS) || defined(__WIN__) |