Merge amd64.(none):/src/mysql-5.0-release

into amd64.(none):/src/rel_clean_up/my50-release

Merge amd64.(none):/src/mysql-5.0-release
into amd64.(none):/src/rel_clean_up/my50-release
627d7d0e · unknown · 1e7367e4 · 57036d8a · 627d7d0e
Commit 627d7d0e authored Apr 28, 2008 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

include/my_global.h include/my_global.h +6 -2

No files found.
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -533,8 +533,12 @@ C_MODE_END
 #undef DBUG_OFF
 #endif
-#if defined(_lint) && !defined(DBUG_OFF)
+/* We might be forced to turn debug off, if not turned off already */
-#define DBUG_OFF
+#if (defined(FORCE_DBUG_OFF) || defined(_lint)) && !defined(DBUG_OFF)
+#  define DBUG_OFF
+#  ifdef DBUG_ON
+#    undef DBUG_ON
+#  endif
 #endif
 #include <my_dbug.h>