bk commit into 5.0 tree (msvensson:1.2248) BUG#21749

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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-08-24 09:15:00+02:00, msvensson@neptunus.(none) +3 -0
  Bug#21749 Compile error because of double "#define"
   - Define DONT_USE_DBUG in thr_alarm-.c and thr_lock.c to make my_global.h turn off DBUG features for those two files.

  include/my_global.h@stripped, 2006-08-24 09:14:58+02:00, msvensson@neptunus.(none) +11 -4
    Check if DONT_USE_DBUG is defined and turn off use of dbug by setting DBUG_OFF if not already set
    Add comments 

  mysys/thr_alarm.c@stripped, 2006-08-24 09:14:58+02:00, msvensson@neptunus.(none) +1 -2
    Use DONT_USE_DBUG to signal to my_global.h that dbug should be turned off in this particular file

  mysys/thr_lock.c@stripped, 2006-08-24 09:14:58+02:00, msvensson@neptunus.(none) +1 -1
    Use DONT_USE_DBUG to signal to my_global.h that dbug should be turned off in this particular file

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug21749/my50-bug21749

--- 1.49/mysys/thr_alarm.c	2006-08-24 09:15:05 +02:00
+++ 1.50/mysys/thr_alarm.c	2006-08-24 09:15:05 +02:00
@@ -15,8 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 /* To avoid problems with alarms in debug code, we disable DBUG here */
-#undef DBUG_OFF
-#define DBUG_OFF
+#define DONT_USE_DBUG
 #include <my_global.h>
 
 #if defined(THREAD) && !defined(DONT_USE_THR_ALARM)

--- 1.50/mysys/thr_lock.c	2006-08-24 09:15:05 +02:00
+++ 1.51/mysys/thr_lock.c	2006-08-24 09:15:05 +02:00
@@ -72,7 +72,7 @@ multiple read locks.
 */
 
 #if !defined(MAIN) && !defined(DBUG_OFF) && !defined(EXTRA_DEBUG)
-#define DBUG_OFF
+#define DONT_USE_DBUG
 #endif
 
 #include "mysys_priv.h"

--- 1.121/include/my_global.h	2006-08-24 09:15:05 +02:00
+++ 1.122/include/my_global.h	2006-08-24 09:15:05 +02:00
@@ -484,12 +484,19 @@ C_MODE_END
 #define _STATIC_VARARGS(X) X
 #define _PC(X)	X
 
-#if defined(DBUG_ON) && defined(DBUG_OFF)
-#undef DBUG_OFF
+#if defined(DONT_USE_DBUG) || defined(_lint)
+/* Make sure DBUG is turned off */
+#if defined(DBUG_ON)
+#undef DBUG_ON
 #endif
-
-#if defined(_lint) && !defined(DBUG_OFF)
+#if !defined(DBUG_OFF)
 #define DBUG_OFF
+#endif
+#endif
+
+#if defined(DBUG_ON) && defined(DBUG_OFF)
+/* Make sure only one of DBUG_ON/DBUG_OFF is used, favor DBUG_ON */
+#undef DBUG_OFF
 #endif
 
 #include <my_dbug.h>