diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-13 01:02:45 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-13 01:02:45 +0200 |
| commit | bc15643c82a049cd3a74ac921859623f9649cede (patch) | |
| tree | bbaeca91e6d0641c334a79ec109bcbec9f3a1832 /mysys/thr_alarm.c | |
| parent | 6288ebb699563c86fbc26660f961fa0e381ae871 (diff) | |
| download | mariadb-git-bc15643c82a049cd3a74ac921859623f9649cede.tar.gz | |
fix after merge
Docs/manual.texi:
Fix after merge
include/my_global.h:
merge fix
mysql-test/r/create.result:
merge fix
mysys/thr_alarm.c:
Fix for using --debug with alarms
Diffstat (limited to 'mysys/thr_alarm.c')
| -rw-r--r-- | mysys/thr_alarm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index f5f26e6d87b..cdfb09e8fea 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -14,6 +14,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* To avoid problems with alarms in debug code, we disable DBUG here */ +#define DBUG_OFF #include <my_global.h> #if defined(THREAD) && !defined(DONT_USE_THR_ALARM) |