diff options
| author | unknown <serg@janus.mylan> | 2008-01-07 22:20:02 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2008-01-07 22:20:02 +0100 |
| commit | b8416bce47af1a5559df24fad647c025b2724400 (patch) | |
| tree | b22e14afefacafceb42591385eccd50e40d7039a /include/my_dbug.h | |
| parent | 7e7c534b736a8c059b6566c148419148a4427294 (diff) | |
| parent | 0bbccfde3449c9ad69b3ab4042c2ca8ab3725f11 (diff) | |
| download | mariadb-git-b8416bce47af1a5559df24fad647c025b2724400.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into janus.mylan:/usr/home/serg/Abk/mysql-maria
dbug/dbug.c:
Auto merged
include/my_dbug.h:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
Diffstat (limited to 'include/my_dbug.h')
| -rw-r--r-- | include/my_dbug.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h index 5372a13f4af..a284e648f7f 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -82,20 +82,20 @@ extern void _db_force_flush(); #define DBUG_ASSERT(A) assert(A) #define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len)) #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len)) -#define DEBUGGER_OFF _dbug_on_= 0 -#define DEBUGGER_ON _dbug_on_= 1 +#define DEBUGGER_OFF do { _dbug_on_= 0; } while(0) +#define DEBUGGER_ON do { _dbug_on_= 1; } while(0) #define IF_DBUG(A) A #else /* No debugger */ #define DBUG_ENTER(a1) #define DBUG_LEAVE -#define DBUG_RETURN(a1) do { return(a1); } while(0) -#define DBUG_VOID_RETURN do { return; } while(0) -#define DBUG_EXECUTE(keyword,a1) do { } while(0) -#define DBUG_EXECUTE_IF(keyword,a1) do { } while(0) +#define DBUG_RETURN(a1) do { return(a1); } while(0) +#define DBUG_VOID_RETURN do { return; } while(0) +#define DBUG_EXECUTE(keyword,a1) do { } while(0) +#define DBUG_EXECUTE_IF(keyword,a1) do { } while(0) #define DBUG_EVALUATE(keyword,a1,a2) (a2) #define DBUG_EVALUATE_IF(keyword,a1,a2) (a2) -#define DBUG_PRINT(keyword,arglist) do { } while(0) +#define DBUG_PRINT(keyword,arglist) do { } while(0) #define DBUG_PUSH(a1) #define DBUG_SET(a1) #define DBUG_SET_INITIAL(a1) @@ -105,14 +105,14 @@ extern void _db_force_flush(); #define DBUG_LONGJMP(a1) longjmp(a1) #define DBUG_DUMP(keyword,a1,a2) #define DBUG_END() -#define DBUG_ASSERT(A) do { } while(0) +#define DBUG_ASSERT(A) do { } while(0) #define DBUG_LOCK_FILE #define DBUG_FILE (stderr) -#define DEBUGGER_OFF -#define DEBUGGER_ON #define DBUG_UNLOCK_FILE #define DBUG_EXPLAIN(buf,len) #define DBUG_EXPLAIN_INITIAL(buf,len) +#define DEBUGGER_OFF do { } while(0) +#define DEBUGGER_ON do { } while(0) #define IF_DBUG(A) #endif #ifdef __cplusplus |