diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-08-24 12:19:41 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-08-24 12:19:41 +0200 |
| commit | 123619fa80ec984a148f0c54ca55cefb4e10f76c (patch) | |
| tree | 5dc425f2e13ded125e04e2371d9e487ced041734 | |
| parent | 3fd4d0f7519dac5f3ce7d0439e748edf30310282 (diff) | |
| parent | 91bdf2952d0f78a514d03235754ee54813f9ae6c (diff) | |
| download | mariadb-git-123619fa80ec984a148f0c54ca55cefb4e10f76c.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749
into neptunus.(none):/home/msvensson/mysql/bug21749/my51-bug21749
dbug/dbug.c:
Auto merged
configure.in:
SCCS merged
| -rw-r--r-- | configure.in | 15 | ||||
| -rw-r--r-- | dbug/dbug.c | 5 |
2 files changed, 7 insertions, 13 deletions
diff --git a/configure.in b/configure.in index 4b1141006b5..cf444393d59 100644 --- a/configure.in +++ b/configure.in @@ -1530,20 +1530,17 @@ AC_ARG_WITH(debug, if test "$with_debug" = "yes" then # Medium debug. - 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" + CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DDBUG_ON -DSAFE_MUTEX $CXXFLAGS" elif test "$with_debug" = "full" then # Full debug. Very slow in some cases - AC_DEFINE([DBUG_ON], [1], [Use libdbug]) - CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" + CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" + CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" else # Optimized version. No debug - AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug]) - CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS" - CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS" + CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS" + CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS" fi # If we should allow error injection tests diff --git a/dbug/dbug.c b/dbug/dbug.c index e377c78b3bd..831c69bcdfb 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -71,13 +71,10 @@ * */ -#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__) |