diff options
| author | unknown <serg@janus.mylan> | 2007-03-06 13:44:57 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-03-06 13:44:57 +0100 |
| commit | b64a40601310a5e7614aaab6ef4e735b3a7bb3c1 (patch) | |
| tree | 6633aa27d1875e982ecf73b0f605752dcadbc94f /include | |
| parent | 39622e126775b6b7de3b727aa4dd0da5fdab5d74 (diff) | |
| parent | 793a137ddd737cd98d8d33efe54bcc218fd60c3f (diff) | |
| download | mariadb-git-b64a40601310a5e7614aaab6ef4e735b3a7bb3c1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
Diffstat (limited to 'include')
| -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 0a529cb47de..0541cf00c29 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -80,6 +80,7 @@ extern FILE *_db_fp_(void); #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 IF_DBUG(A) A #else /* No debugger */ #define DBUG_ENTER(a1) @@ -106,6 +107,7 @@ extern FILE *_db_fp_(void); #define DBUG_UNLOCK_FILE #define DBUG_EXPLAIN(buf,len) #define DBUG_EXPLAIN_INITIAL(buf,len) +#define IF_DBUG(A) #endif #ifdef __cplusplus } |