bk commit into 5.0 tree (iggy:1.2610)

[Ignacio Galarza]

Below is the list of changes that have just been committed into a local
5.0 repository of iggy.  When iggy 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, 2008-04-28 14:58:32-04:00, iggy@amd64.(none) +1 -0
  Correct failing build.

  include/my_global.h@stripped, 2008-04-28 14:58:30-04:00, iggy@amd64.(none) +6 -2
    Correct failing build.

diff -Nrup a/include/my_global.h b/include/my_global.h
--- a/include/my_global.h	2008-03-27 18:35:53 -04:00
+++ b/include/my_global.h	2008-04-28 14:58:30 -04:00
@@ -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>