Merge bk-internal:/home/bk/mysql-5.1-new-maint

into  rama.(none):/home/jimw/my/mysql-5.1-clean

dbug/dbug.c

@@ -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 @@ static unsigned long Clock(void);
 #define ChangeOwner(cs,name)
 #endif
 
+
 /*
 ** Macros to allow dbugging with threads
 */
@@ -2351,3 +2354,5 @@ va_list ap;
 }
 
 #endif  /* NO_VARARGS */
+
+#endif