diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-10-12 00:37:58 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-12 00:37:58 +0200 |
commit | dfb74dea300f83880c11600dc726a9cae559f356 (patch) | |
tree | 76da0d6e23f188bc13520bf80496e9053f227d9a /include | |
parent | b785857d00a0fd9c98cb52823357bfad8fb18289 (diff) | |
parent | e7cb032e560e14865941ecdcb553cd3aba856b68 (diff) | |
download | mariadb-git-dfb74dea300f83880c11600dc726a9cae559f356.tar.gz |
Merge branch '10.0' into 10.1
Diffstat (limited to 'include')
-rw-r--r-- | include/maria.h | 2 | ||||
-rw-r--r-- | include/my_alarm.h | 2 | ||||
-rw-r--r-- | include/my_base.h | 8 | ||||
-rw-r--r-- | include/my_dbug.h | 4 | ||||
-rw-r--r-- | include/my_global.h | 2 | ||||
-rw-r--r-- | include/my_pthread.h | 8 | ||||
-rw-r--r-- | include/my_sys.h | 12 | ||||
-rw-r--r-- | include/mysql.h | 4 |
8 files changed, 21 insertions, 21 deletions
diff --git a/include/maria.h b/include/maria.h index 5618e8ae1a4..bdd53f3d183 100644 --- a/include/maria.h +++ b/include/maria.h @@ -44,7 +44,7 @@ extern "C" { #define MARIA_NAME_IEXT ".MAI" #define MARIA_NAME_DEXT ".MAD" /* Max extra space to use when sorting keys */ -#define MARIA_MAX_TEMP_LENGTH 2*1024L*1024L*1024L +#define MARIA_MAX_TEMP_LENGTH (2*1024L*1024L*1024L) /* Possible values for maria_block_size (must be power of 2) */ #define MARIA_KEY_BLOCK_LENGTH 8192 /* default key block length */ #define MARIA_MIN_KEY_BLOCK_LENGTH 1024 /* Min key block length */ diff --git a/include/my_alarm.h b/include/my_alarm.h index c3707cba395..73bb6ab76cc 100644 --- a/include/my_alarm.h +++ b/include/my_alarm.h @@ -50,7 +50,7 @@ extern ulong my_time_to_wait_for_lock; #define ALARM_INIT #define ALARM_END #define ALARM_TEST (alarm_pos++ >= alarm_end_pos) -#define ALARM_REINIT alarm_end_pos+=MY_HOW_OFTEN_TO_WRITE +#define ALARM_REINIT (alarm_end_pos+=MY_HOW_OFTEN_TO_WRITE) #endif /* HAVE_ALARM */ #ifdef __cplusplus diff --git a/include/my_base.h b/include/my_base.h index 91a26f316a7..8b546edac43 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -537,13 +537,13 @@ typedef ulong key_part_map; #define SEARCH_NULL_ARE_EQUAL 32768 /* NULL in keys are equal */ #define SEARCH_NULL_ARE_NOT_EQUAL 65536 /* NULL in keys are not equal */ /* Use this when inserting a key in position order */ -#define SEARCH_INSERT SEARCH_NULL_ARE_NOT_EQUAL*2 +#define SEARCH_INSERT (SEARCH_NULL_ARE_NOT_EQUAL*2) /* Only part of the key is specified while reading */ -#define SEARCH_PART_KEY SEARCH_INSERT*2 +#define SEARCH_PART_KEY (SEARCH_INSERT*2) /* Used when user key (key 2) contains transaction id's */ -#define SEARCH_USER_KEY_HAS_TRANSID SEARCH_PART_KEY*2 +#define SEARCH_USER_KEY_HAS_TRANSID (SEARCH_PART_KEY*2) /* Used when page key (key 1) contains transaction id's */ -#define SEARCH_PAGE_KEY_HAS_TRANSID SEARCH_USER_KEY_HAS_TRANSID*2 +#define SEARCH_PAGE_KEY_HAS_TRANSID (SEARCH_USER_KEY_HAS_TRANSID*2) /* bits in opt_flag */ #define QUICK_USED 1 diff --git a/include/my_dbug.h b/include/my_dbug.h index bcf2015466d..f4c854bc10c 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -58,7 +58,7 @@ extern void _db_end_(void); extern void _db_lock_file_(void); extern void _db_unlock_file_(void); extern FILE *_db_fp_(void); -extern void _db_flush_(); +extern void _db_flush_(void); extern void dbug_swap_code_state(void **code_state_store); extern void dbug_free_code_state(void **code_state_store); extern const char* _db_get_func_(void); @@ -123,7 +123,7 @@ extern const char* _db_get_func_(void); #ifdef __WIN__ #define DBUG_SUICIDE() DBUG_ABORT() #else -extern void _db_suicide_(); +extern void _db_suicide_(void); #define DBUG_SUICIDE() (_db_flush_(), _db_suicide_()) #endif diff --git a/include/my_global.h b/include/my_global.h index f7d8f795051..30e08d7a03a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -547,7 +547,7 @@ typedef int my_socket; /* File descriptor for sockets */ /* Type for fuctions that handles signals */ #define sig_handler RETSIGTYPE C_MODE_START -typedef void (*sig_return)();/* Returns type from signal */ +typedef void (*sig_return)(); /* Returns type from signal */ C_MODE_END #if defined(__GNUC__) && !defined(_lint) typedef char pchar; /* Mixed prototypes can take char */ diff --git a/include/my_pthread.h b/include/my_pthread.h index 104e91715e7..1b7d289b2ef 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -701,8 +701,8 @@ extern void my_thread_end(void); extern const char *my_thread_name(void); extern my_thread_id my_thread_dbug_id(void); extern int pthread_dummy(int); -extern void my_mutex_init(); -extern void my_mutex_end(); +extern void my_mutex_init(void); +extern void my_mutex_end(void); /* All thread specific variables are in the following struct */ @@ -745,8 +745,8 @@ struct st_my_thread_var }; extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const)); -extern void **my_thread_var_dbug(); -extern safe_mutex_t **my_thread_var_mutex_in_use(); +extern void **my_thread_var_dbug(void); +extern safe_mutex_t **my_thread_var_mutex_in_use(void); extern uint my_thread_end_wait_time; extern my_bool safe_mutex_deadlock_detector; #define my_thread_var (_my_thread_var()) diff --git a/include/my_sys.h b/include/my_sys.h index 31d4ffd7667..9ae15db649c 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -690,7 +690,7 @@ extern void my_osmaperr(unsigned long last_error); #endif extern void init_glob_errs(void); -extern const char** get_global_errmsgs(); +extern const char** get_global_errmsgs(void); extern void wait_for_free_space(const char *filename, int errors); extern FILE *my_fopen(const char *FileName,int Flags,myf MyFlags); extern FILE *my_fdopen(File Filedes,const char *name, int Flags,myf MyFlags); @@ -715,7 +715,7 @@ extern void my_printf_error(uint my_err, const char *format, ATTRIBUTE_FORMAT(printf, 2, 4); extern void my_printv_error(uint error, const char *format, myf MyFlags, va_list ap); -extern int my_error_register(const char** (*get_errmsgs) (), +extern int my_error_register(const char** (*get_errmsgs) (void), uint first, uint last); extern const char **my_error_unregister(uint first, uint last); extern void my_message(uint my_err, const char *str,myf MyFlags); @@ -925,12 +925,12 @@ extern uint my_set_max_open_files(uint files); void my_free_open_file_info(void); extern my_bool my_gethwaddr(uchar *to); -extern int my_getncpus(); +extern int my_getncpus(void); #define HRTIME_RESOLUTION 1000000ULL /* microseconds */ typedef struct {ulonglong val;} my_hrtime_t; -void my_time_init(); -extern my_hrtime_t my_hrtime(); +void my_time_init(void); +extern my_hrtime_t my_hrtime(void); extern ulonglong my_interval_timer(void); extern ulonglong my_getcputime(void); @@ -989,7 +989,7 @@ int my_msync(int, void *, size_t, int); void my_uuid_init(ulong seed1, ulong seed2); void my_uuid(uchar *guid); void my_uuid2str(const uchar *guid, char *s); -void my_uuid_end(); +void my_uuid_end(void); /* character sets */ extern void my_charset_loader_init_mysys(MY_CHARSET_LOADER *loader); diff --git a/include/mysql.h b/include/mysql.h index d9d9739dd1f..f088ad668a1 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -79,8 +79,8 @@ extern unsigned int mariadb_deinitialize_ssl; extern unsigned int mysql_port; extern char *mysql_unix_port; -#define CLIENT_NET_READ_TIMEOUT 365*24*3600 /* Timeout on read */ -#define CLIENT_NET_WRITE_TIMEOUT 365*24*3600 /* Timeout on write */ +#define CLIENT_NET_READ_TIMEOUT (365*24*3600) /* Timeout on read */ +#define CLIENT_NET_WRITE_TIMEOUT (365*24*3600) /* Timeout on write */ #define IS_PRI_KEY(n) ((n) & PRI_KEY_FLAG) #define IS_NOT_NULL(n) ((n) & NOT_NULL_FLAG) |