Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam

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

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam
into amd64.(none):/src/rel_clean_up/my50-rel_clean_up
96e405b6 · unknown · 89b866e7 · e20145f6 · 96e405b6
Commit 96e405b6 authored Apr 28, 2008 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

mysys/thr_alarm.c mysys/thr_alarm.c +1 -2

No files found.
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -14,8 +14,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)