diff options
author | kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se <> | 2006-10-12 19:43:47 +0200 |
---|---|---|
committer | kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se <> | 2006-10-12 19:43:47 +0200 |
commit | 8a7413f704c49b60509975bef5204d7c9b55e3d3 (patch) | |
tree | 68c02acb46f7cb7db77cfa44a6cc62dd14f0e3af /mysys/thr_alarm.c | |
parent | e71f10c8b051b9e4536a6c721c19d8ff138fcf52 (diff) | |
download | mariadb-git-8a7413f704c49b60509975bef5204d7c9b55e3d3.tar.gz |
thr_alarm.c, thr_lock.c, my_global.h:
Avoid multiple define of DBUG_OFF (bug#21749)
Diffstat (limited to 'mysys/thr_alarm.c')
-rw-r--r-- | mysys/thr_alarm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index dcb41837d96..c55cc32b47d 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -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) |