diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-09-10 08:06:27 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-09-10 08:06:27 -0400 |
| commit | cf74e43f1583a81016f0ce6cbbe087b38853b5cd (patch) | |
| tree | 778fee9432c6a68f033c652aa8b4d32b49a0e4f3 /include | |
| parent | f4b671d8bc1ab80342918820a2bc841c5542d57d (diff) | |
| parent | 1f1d673200b312b85739f455c74c25c399f1cc93 (diff) | |
| download | mariadb-git-cf74e43f1583a81016f0ce6cbbe087b38853b5cd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 3 | ||||
| -rw-r--r-- | include/my_dbug.h | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/config-win.h b/include/config-win.h index 279be7aa5e4..a45ee5e4eb3 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -205,6 +205,9 @@ typedef uint rf_SetTimer; /* If LOAD DATA LOCAL INFILE should be enabled by default */ #define ENABLED_LOCAL_INFILE 1 +/* If query profiling should be enabled by default */ +#define ENABLED_PROFILING 1 + /* Convert some simple functions to Posix */ #define my_sigset(A,B) signal((A),(B)) diff --git a/include/my_dbug.h b/include/my_dbug.h index 31fd507ec73..9aa8ef3c197 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -50,12 +50,12 @@ extern void _db_unlock_file(void); &_db_framep_) #define DBUG_LEAVE \ (_db_return_ (__LINE__, &_db_func_, &_db_file_, &_db_level_)) -#define DBUG_RETURN(a1) {DBUG_LEAVE; return(a1);} -#define DBUG_VOID_RETURN {DBUG_LEAVE; return;} +#define DBUG_RETURN(a1) do {DBUG_LEAVE; return(a1);} while(0) +#define DBUG_VOID_RETURN do {DBUG_LEAVE; return;} while(0) #define DBUG_EXECUTE(keyword,a1) \ - {if (_db_on_) {if (_db_keyword_ (keyword)) { a1 }}} + do {if (_db_on_) {if (_db_keyword_ (keyword)) { a1 }}} while(0) #define DBUG_PRINT(keyword,arglist) \ - {if (_db_on_) {_db_pargs_(__LINE__,keyword); _db_doprnt_ arglist;}} + do {if (_db_on_) {_db_pargs_(__LINE__,keyword); _db_doprnt_ arglist;}} while(0) #define DBUG_PUSH(a1) _db_push_ (a1) #define DBUG_POP() _db_pop_ () #define DBUG_PROCESS(a1) (_db_process_ = a1) @@ -63,7 +63,7 @@ extern void _db_unlock_file(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)\ - {if (_db_on_) {_db_dump_(__LINE__,keyword,a1,a2);}} + do {if (_db_on_) {_db_dump_(__LINE__,keyword,a1,a2);}} while(0) #define DBUG_IN_USE (_db_fp_ && _db_fp_ != stderr) #define DEBUGGER_OFF _no_db_=1;_db_on_=0; #define DEBUGGER_ON _no_db_=0 @@ -73,7 +73,7 @@ extern void _db_unlock_file(void); #define DBUG_OUTPUT(A) { _db_output_(A); } #define DBUG_ASSERT(A) assert(A) #define DBUG_EXECUTE_IF(keyword,a1) \ - {if (_db_on_) {if (_db_strict_keyword_ (keyword)) { a1 }}} + do {if (_db_on_) {if (_db_strict_keyword_ (keyword)) { a1 }}} while(0) #define IF_DBUG(A) A #else /* No debugger */ |