bk commit into 5.1 tree (cmiller:1.2353)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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@stripped, 2006-09-06 17:10:58-04:00, cmiller@stripped +1 -0
  Fix build problem for when not compiled with debugging.

  dbug/dbug.c@stripped, 2006-09-06 17:10:56-04:00, cmiller@stripped +8 -3
    Don't try to force DBUG on.
    
    Conditionally compile this file, as the headers we load may change the 
    value of DBUG_OFF /after/ we set it.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint

--- 1.31/dbug/dbug.c	2006-09-06 17:11:02 -04:00
+++ 1.32/dbug/dbug.c	2006-09-06 17:11:02 -04:00
@@ -71,9 +71,7 @@
  *
  */
 
-#ifdef DBUG_OFF
-#undef DBUG_OFF
-#endif
+
 #include <my_global.h>
 #include <m_string.h>
 #include <errno.h>
@@ -81,6 +79,10 @@
 #include <process.h>
 #endif
 
+
+#ifndef DBUG_OFF
+
+
 /*
  *            Manifest constants which may be "tuned" if desired.
  */
@@ -313,6 +315,7 @@
 #define ChangeOwner(cs,name)
 #endif
 
+
 /*
 ** Macros to allow dbugging with threads
 */
@@ -2351,3 +2354,5 @@
 }
 
 #endif  /* NO_VARARGS */
+
+#endif