diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-23 00:20:44 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-23 00:20:44 +0400 |
| commit | 08ecfb9a8b9176ab087e624ec8b6287fb344cc06 (patch) | |
| tree | 1d206a9ce7243a176e9558896ec0d8e377333eeb /include | |
| parent | 99eae48a97fdf4399ca55b7e28ff97a9332f0f23 (diff) | |
| parent | 2f5413ebc5a47ed45abe0d3c660cfbf673c666e2 (diff) | |
| download | mariadb-git-08ecfb9a8b9176ab087e624ec8b6287fb344cc06.tar.gz | |
Automerge from mysql-next-mr.
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 | 11 |
3 files changed, 13 insertions, 10 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 79fcae6d61f..ca1e1a9d845 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -559,12 +559,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 c75863f454e..320b7e94467 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -181,6 +181,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); @@ -734,7 +744,6 @@ extern int wild_compare(const char *str,const char *wildstr, extern WF_PACK *wf_comp(char * str); extern int wf_test(struct wild_file_pack *wf_pack,const char *name); extern void wf_end(struct wild_file_pack *buffer); -extern size_t strip_sp(char * str); extern my_bool array_append_string_unique(const char *str, const char **array, size_t size); extern void get_date(char * to,int timeflag,time_t use_time); |