MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kent Date:October 12 2006 5:44pm
Subject:bk commit into 5.1 tree (kent:1.2314) BUG#21749
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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-10-12 19:43:47+02:00, kent@stripped +3 -0
  thr_alarm.c, thr_lock.c, my_global.h:
    Avoid multiple define of DBUG_OFF (bug#21749)

  include/my_global.h@stripped, 2006-10-12 19:42:01+02:00, kent@stripped +7 -2
    Avoid multiple define of DBUG_OFF (bug#21749)

  mysys/thr_alarm.c@stripped, 2006-10-12 19:41:06+02:00, kent@stripped +1 -2
    Avoid multiple define of DBUG_OFF (bug#21749)

  mysys/thr_lock.c@stripped, 2006-10-12 19:41:32+02:00, kent@stripped +1 -1
    Avoid multiple define of DBUG_OFF (bug#21749)

# 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:	kent
# Host:	c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-release

--- 1.50/mysys/thr_alarm.c	2006-10-12 19:44:38 +02:00
+++ 1.51/mysys/thr_alarm.c	2006-10-12 19:44:38 +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 FORCE_DBUG_OFF
 #include <my_global.h>
 
 #if defined(THREAD) && !defined(DONT_USE_THR_ALARM)

--- 1.53/mysys/thr_lock.c	2006-10-12 19:44:38 +02:00
+++ 1.54/mysys/thr_lock.c	2006-10-12 19:44:38 +02:00
@@ -72,7 +72,7 @@
 */
 
 #if !defined(MAIN) && !defined(DBUG_OFF) && !defined(EXTRA_DEBUG)
-#define DBUG_OFF
+#define FORCE_DBUG_OFF
 #endif
 
 #include "mysys_priv.h"

--- 1.147/include/my_global.h	2006-10-12 19:44:38 +02:00
+++ 1.148/include/my_global.h	2006-10-12 19:44:38 +02:00
@@ -614,12 +614,17 @@
 #define _STATIC_VARARGS(X) X
 #define _PC(X)	X
 
+/* The DBUG_ON flag always takes precedence over default DBUG_OFF */
 #if defined(DBUG_ON) && defined(DBUG_OFF)
 #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>
Thread
bk commit into 5.1 tree (kent:1.2314) BUG#21749kent12 Oct