diff options
| author | unknown <knielsen@mysql.com> | 2006-05-16 14:34:35 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-16 14:34:35 +0200 |
| commit | 771d3d822955e28c58b4384524938ba9162ec5ab (patch) | |
| tree | 08fb4ce18ad7defbb710e90b6e9b2c7cccc3eabf /include/my_dbug.h | |
| parent | 39b5c0f50dadd8d2018bd4252e9b748a708675dd (diff) | |
| parent | a046322b4e61aaef3db9efc9e85477792085c453 (diff) | |
| download | mariadb-git-771d3d822955e28c58b4384524938ba9162ec5ab.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
into mysql.com:/usr/local/mysql/tmp-5.1
client/mysqlbinlog.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/my_init.c:
Auto merged
sql/mysqld.cc:
Auto merged
dbug/dbug.c:
Manual merge
include/my_dbug.h:
Manual merge
Diffstat (limited to 'include/my_dbug.h')
| -rw-r--r-- | include/my_dbug.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h index 65bb7b55d0d..a397861c1af 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -42,6 +42,7 @@ extern void _db_pargs_(uint _line_,const char *keyword); extern void _db_doprnt_ _VARARGS((const char *format,...)); extern void _db_dump_(uint _line_,const char *keyword,const char *memory, uint length); +extern void _db_end_(void); extern void _db_lock_file_(void); extern void _db_unlock_file_(void); extern FILE *_db_fp_(void); @@ -73,6 +74,7 @@ extern FILE *_db_fp_(void); #define DBUG_SETJMP(a1) (_db_setjmp_ (), setjmp (a1)) #define DBUG_LONGJMP(a1,a2) (_db_longjmp_ (), longjmp (a1, a2)) #define DBUG_DUMP(keyword,a1,a2) _db_dump_(__LINE__,keyword,a1,a2) +#define DBUG_END() _db_end_ () #define DBUG_LOCK_FILE _db_lock_file_() #define DBUG_UNLOCK_FILE _db_unlock_file_() #define DBUG_ASSERT(A) assert(A) @@ -97,6 +99,7 @@ extern FILE *_db_fp_(void); #define DBUG_SETJMP(a1) setjmp(a1) #define DBUG_LONGJMP(a1) longjmp(a1) #define DBUG_DUMP(keyword,a1,a2) +#define DBUG_END() #define DBUG_ASSERT(A) #define DBUG_LOCK_FILE #define DBUG_FILE (stderr) |