bk commit into 5.0 tree (msvensson:1.2173) BUG#19517

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2173 06/06/12 13:07:40 msvensson@neptunus.(none) +2 -0
  Bug#19517 No simple way to detect wether server was compiled with libdbug
   - Define DBUG_ON and DBUG_OFF in config.h

  dbug/dbug.c
    1.23 06/06/12 13:07:36 msvensson@neptunus.(none) +4 -1
    Undef DBUG_OFF if defined when compiling dbug.c, this is done as we always compile
dbug.c even when DBUG_OFF is selected.

  configure.in
    1.393 06/06/12 13:07:36 msvensson@neptunus.(none) +9 -6
    Define DBUG_ON and DBUG_OFF in config.h instead of in compiler flags

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/my50-bug19517

--- 1.392/configure.in	2006-06-02 21:41:47 +02:00
+++ 1.393/configure.in	2006-06-12 13:07:36 +02:00
@@ -1651,17 +1651,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

--- 1.22/dbug/dbug.c	2006-05-15 18:07:13 +02:00
+++ 1.23/dbug/dbug.c	2006-06-12 13:07:36 +02:00
@@ -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__)