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

Merge amd64.(none):/src/mysql-5.0-release 

into  amd64.(none):/src/rel_clean_up/my50-release
parents 7a4adfa9 27663116

include/my_global.h

+6 −2
Original line number Diff line number Diff line
@@ -533,8 +533,12 @@ C_MODE_END 
#undef DBUG_OFF

#endif



#if defined(_lint) && !defined(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>