diff options
| author | unknown <knielsen@mysql.com> | 2006-05-15 19:57:12 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-15 19:57:12 +0200 |
| commit | 167d54cd63795a91b4e9b10226504b632c3b33b7 (patch) | |
| tree | 86fbbc9dc5f8d1552d45198060c66f8612a4ff9b /include | |
| parent | f3be3b6a91aa8ac631a8ff40e49756bd9200b374 (diff) | |
| parent | a046322b4e61aaef3db9efc9e85477792085c453 (diff) | |
| download | mariadb-git-167d54cd63795a91b4e9b10226504b632c3b33b7.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
into mysql.com:/usr/local/mysql/tmp-5.0
include/my_sys.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_dbug.h | 3 | ||||
| -rw-r--r-- | include/my_sys.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h index b76a3fcc8c9..6e60b599f53 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -40,6 +40,7 @@ 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_output_(uint flag); +extern void _db_end_(void); extern void _db_lock_file(void); extern void _db_unlock_file(void); @@ -66,6 +67,7 @@ extern void _db_unlock_file(void); #define DBUG_IN_USE (_db_fp_ && _db_fp_ != stderr) #define DEBUGGER_OFF _no_db_=1;_db_on_=0; #define DEBUGGER_ON _no_db_=0 +#define DBUG_END() _db_end_ () #define DBUG_LOCK_FILE { _db_lock_file(); } #define DBUG_UNLOCK_FILE { _db_unlock_file(); } #define DBUG_OUTPUT(A) { _db_output_(A); } @@ -90,6 +92,7 @@ extern void _db_unlock_file(void); #define DBUG_IN_USE 0 #define DEBUGGER_OFF #define DEBUGGER_ON +#define DBUG_END() #define DBUG_LOCK_FILE #define DBUG_UNLOCK_FILE #define DBUG_OUTPUT(A) diff --git a/include/my_sys.h b/include/my_sys.h index 65a295ee39e..229389f1ac5 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -75,6 +75,7 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_CHECK_ERROR 1 /* Params to my_end; Check open-close */ #define MY_GIVE_INFO 2 /* Give time info about process*/ +#define MY_DONT_FREE_DBUG 4 /* Do not call DBUG_END() in my_end() */ #define ME_HIGHBYTE 8 /* Shift for colours */ #define ME_NOCUR 1 /* Don't use curses message */ |