Commit 3d0f5666 authored by iggy@amd64.(none)'s avatar iggy@amd64.(none)
Browse files

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

into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up
parents e9e66793 666d0d06

mysys/thr_alarm.c

+1 −2
Original line number Diff line number Diff line
@@ -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)