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
c59d072a · iggy@amd64.(none) · 7a4adfa9 · 27663116 · c59d072a
Commit c59d072a authored Apr 28, 2008 by iggy@amd64.(none)
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)
-#define DBUG_OFF
+/* We might be forced to turn debug off, if not turned off already */
+#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>