diff options
| author | Mikael Ronstrom <mikael@dator8> | 2011-03-04 13:12:31 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@dator8> | 2011-03-04 13:12:31 +0100 |
| commit | a41873670cbd3f0ca8ae8a8a992f02294d129539 (patch) | |
| tree | a7f5ebaca17d2031a07efaa3418357b9b756de46 /include | |
| parent | f4c515ef5338aa362c5a227d5d96473fbc3fa9db (diff) | |
| download | mariadb-git-a41873670cbd3f0ca8ae8a8a992f02294d129539.tar.gz | |
More review fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 4 | ||||
| -rw-r--r-- | include/mysql/plugin_audit.h.pp | 4 | ||||
| -rw-r--r-- | include/mysql/plugin_auth.h.pp | 4 | ||||
| -rw-r--r-- | include/mysql/plugin_ftparser.h.pp | 4 | ||||
| -rw-r--r-- | include/mysql/service_thd_wait.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index ed96abc7711..e13ef1af067 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -627,8 +627,8 @@ extern FILE *my_freopen(const char *path, const char *mode, FILE *stream); extern int my_fclose(FILE *fd,myf MyFlags); extern File my_fileno(FILE *fd); extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags); -void thr_set_sync_wait_callback(void (*before_sync)(void), - void (*after_sync)(void)); +extern void thr_set_sync_wait_callback(void (*before_sync)(void), + void (*after_sync)(void)); extern int my_sync(File fd, myf my_flags); extern int my_sync_dir(const char *dir_name, myf my_flags); extern int my_sync_dir_by_file(const char *file_name, myf my_flags); diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp index f74078c531f..732503e176a 100644 --- a/include/mysql/plugin_audit.h.pp +++ b/include/mysql/plugin_audit.h.pp @@ -46,10 +46,10 @@ typedef enum _thd_wait_type_e { THD_WAIT_LAST= 11 } thd_wait_type; extern struct thd_wait_service_st { - void (*thd_wait_begin_func)(void*, thd_wait_type); + void (*thd_wait_begin_func)(void*, int); void (*thd_wait_end_func)(void*); } *thd_wait_service; -void thd_wait_begin(void* thd, thd_wait_type wait_type); +void thd_wait_begin(void* thd, int wait_type); void thd_wait_end(void* thd); #include <mysql/service_thread_scheduler.h> struct scheduler_functions; diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp index aed764ddb51..e65278c518e 100644 --- a/include/mysql/plugin_auth.h.pp +++ b/include/mysql/plugin_auth.h.pp @@ -46,10 +46,10 @@ typedef enum _thd_wait_type_e { THD_WAIT_LAST= 11 } thd_wait_type; extern struct thd_wait_service_st { - void (*thd_wait_begin_func)(void*, thd_wait_type); + void (*thd_wait_begin_func)(void*, int); void (*thd_wait_end_func)(void*); } *thd_wait_service; -void thd_wait_begin(void* thd, thd_wait_type wait_type); +void thd_wait_begin(void* thd, int wait_type); void thd_wait_end(void* thd); #include <mysql/service_thread_scheduler.h> struct scheduler_functions; diff --git a/include/mysql/plugin_ftparser.h.pp b/include/mysql/plugin_ftparser.h.pp index f3ca2070e60..c29eac45b19 100644 --- a/include/mysql/plugin_ftparser.h.pp +++ b/include/mysql/plugin_ftparser.h.pp @@ -46,10 +46,10 @@ typedef enum _thd_wait_type_e { THD_WAIT_LAST= 11 } thd_wait_type; extern struct thd_wait_service_st { - void (*thd_wait_begin_func)(void*, thd_wait_type); + void (*thd_wait_begin_func)(void*, int); void (*thd_wait_end_func)(void*); } *thd_wait_service; -void thd_wait_begin(void* thd, thd_wait_type wait_type); +void thd_wait_begin(void* thd, int wait_type); void thd_wait_end(void* thd); #include <mysql/service_thread_scheduler.h> struct scheduler_functions; diff --git a/include/mysql/service_thd_wait.h b/include/mysql/service_thd_wait.h index a7ce2dbf501..f5d2a75f5fc 100644 --- a/include/mysql/service_thd_wait.h +++ b/include/mysql/service_thd_wait.h @@ -78,7 +78,7 @@ typedef enum _thd_wait_type_e { } thd_wait_type; extern struct thd_wait_service_st { - void (*thd_wait_begin_func)(MYSQL_THD, thd_wait_type); + void (*thd_wait_begin_func)(MYSQL_THD, int); void (*thd_wait_end_func)(MYSQL_THD); } *thd_wait_service; @@ -90,7 +90,7 @@ extern struct thd_wait_service_st { #else -void thd_wait_begin(MYSQL_THD thd, thd_wait_type wait_type); +void thd_wait_begin(MYSQL_THD thd, int wait_type); void thd_wait_end(MYSQL_THD thd); #endif |