diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-13 13:42:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-13 13:42:38 +0400 |
| commit | 0f51423532cac99ae28928e4b267a9a80c0b89f7 (patch) | |
| tree | e56ffd06670e5f719dc7c91ca477eb50aa578a24 /include | |
| parent | 3dcbeb36b4aa8362165218cdeb5cd7ba761a0dff (diff) | |
| parent | 23bdf0d805026b220061487688f0cb2d2b272975 (diff) | |
| download | mariadb-git-0f51423532cac99ae28928e4b267a9a80c0b89f7.tar.gz | |
Merge from mysql-5.1.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_dbug.h | 6 | ||||
| -rw-r--r-- | include/my_global.h | 6 | ||||
| -rw-r--r-- | include/my_sys.h | 10 |
3 files changed, 13 insertions, 9 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h index 474a46f29dd..0ba72b2210d 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -137,13 +137,13 @@ extern FILE *_db_fp_(void); #define DBUG_EVALUATE_IF(keyword,a1,a2) (a2) #define DBUG_PRINT(keyword,arglist) do { } while(0) #define DBUG_PUSH(a1) -#define DBUG_SET(a1) -#define DBUG_SET_INITIAL(a1) +#define DBUG_SET(a1) do { } while(0) +#define DBUG_SET_INITIAL(a1) do { } while(0) #define DBUG_POP() #define DBUG_PROCESS(a1) #define DBUG_SETJMP(a1) setjmp(a1) #define DBUG_LONGJMP(a1) longjmp(a1) -#define DBUG_DUMP(keyword,a1,a2) +#define DBUG_DUMP(keyword,a1,a2) do { } while(0) #define DBUG_END() #define DBUG_ASSERT(A) do { } while(0) #define DBUG_LOCK_FILE diff --git a/include/my_global.h b/include/my_global.h index e7d0026ac53..0f312f13bf0 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -558,12 +558,6 @@ int __void__; #define LINT_INIT(var) #endif -#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(HAVE_purify) -#define PURIFY_OR_LINT_INIT(var) var=0 -#else -#define PURIFY_OR_LINT_INIT(var) -#endif - /* Suppress uninitialized variable warning without generating code. diff --git a/include/my_sys.h b/include/my_sys.h index cb9a24bbd7f..166133251bc 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -172,6 +172,16 @@ extern char *my_strndup(const char *from, size_t length, #define TRASH(A,B) /* nothing */ #endif +#if defined(ENABLED_DEBUG_SYNC) +extern void (*debug_sync_C_callback_ptr)(const char *, size_t); +#define DEBUG_SYNC_C(_sync_point_name_) do { \ + if (debug_sync_C_callback_ptr != NULL) \ + (*debug_sync_C_callback_ptr)(STRING_WITH_LEN(_sync_point_name_)); } \ + while(0) +#else +#define DEBUG_SYNC_C(_sync_point_name_) +#endif /* defined(ENABLED_DEBUG_SYNC) */ + #ifdef HAVE_LARGE_PAGES extern uint my_get_large_page_size(void); extern uchar * my_large_malloc(size_t size, myf my_flags); |