diff options
| author | unknown <serg@janus.mylan> | 2008-02-06 19:15:26 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2008-02-06 19:15:26 +0100 |
| commit | c04dd35982cd8da63de2bd0aaff0e42ab34add4e (patch) | |
| tree | 80bbf01f9ba0d9079fffa7b5f682c41ddb6af4d4 /include/my_dbug.h | |
| parent | 7b59b82f8fdb5e3b40f673ba41ce17879262e5f0 (diff) | |
| parent | 3e9e629c591dacb625cef44f5ec589d654a36b53 (diff) | |
| download | mariadb-git-c04dd35982cd8da63de2bd0aaff0e42ab34add4e.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into janus.mylan:/usr/home/serg/Abk/mysql-maria
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
include/my_dbug.h:
merged
Diffstat (limited to 'include/my_dbug.h')
| -rw-r--r-- | include/my_dbug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h index bce22668eed..a9611b05f0a 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -86,6 +86,7 @@ extern FILE *_db_fp_(void); #define DEBUGGER_OFF do { _dbug_on_= 0; } while(0) #define DEBUGGER_ON do { _dbug_on_= 1; } while(0) #define IF_DBUG(A) A +#define DBUG_ABORT() ((void)fflush(DBUG_FILE), abort()) #else /* No debugger */ #define DBUG_ENTER(a1) @@ -115,6 +116,7 @@ extern FILE *_db_fp_(void); #define DEBUGGER_OFF do { } while(0) #define DEBUGGER_ON do { } while(0) #define IF_DBUG(A) +#define DBUG_ABORT() abort() #endif #ifdef __cplusplus } |