diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 4 | ||||
| -rw-r--r-- | include/my_dbug.h | 1 | ||||
| -rw-r--r-- | include/mysql.h.pp | 6 | ||||
| -rw-r--r-- | include/typelib.h | 6 | ||||
| -rw-r--r-- | include/violite.h | 1 |
5 files changed, 14 insertions, 4 deletions
diff --git a/include/config-win.h b/include/config-win.h index a85761ea389..f53009303b6 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -436,3 +436,7 @@ inline ulonglong double2ulonglong(double d) #define HAVE_UCA_COLLATIONS 1 #define HAVE_BOOL 1 +#ifndef EMBEDDED_LIBRARY +#define HAVE_LIBEVENT 1 +#define HAVE_POOL_OF_THREADS 1 +#endif diff --git a/include/my_dbug.h b/include/my_dbug.h index 4e883563759..5c185d5eef2 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -33,6 +33,7 @@ extern my_bool _dbug_on_; extern my_bool _db_keyword_(struct _db_code_state_ *, const char *, int); extern int _db_explain_(struct _db_code_state_ *cs, char *buf, size_t len); extern int _db_explain_init_(char *buf, size_t len); +extern int _db_is_pushed_(void); extern void _db_setjmp_(void); extern void _db_longjmp_(void); extern void _db_process_(const char *name); diff --git a/include/mysql.h.pp b/include/mysql.h.pp index d9e9c7fa96d..081c95c5638 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -223,8 +223,10 @@ typedef struct st_typelib { unsigned int *type_lengths; } TYPELIB; extern my_ulonglong find_typeset(char *x, TYPELIB *typelib,int *error_position); -extern int find_type_or_exit(const char *x, TYPELIB *typelib, - const char *option); +extern int find_type_with_warning(const char *x, TYPELIB *typelib, + const char *option); +extern uint find_type_or_exit(const char *x, TYPELIB *typelib, + const char *option); extern int find_type(char *x, const TYPELIB *typelib, unsigned int full_name); extern void make_type(char *to,unsigned int nr,TYPELIB *typelib); extern const char *get_type(TYPELIB *typelib,unsigned int nr); diff --git a/include/typelib.h b/include/typelib.h index 46106d1bdab..a5ac5cc7bbf 100644 --- a/include/typelib.h +++ b/include/typelib.h @@ -27,8 +27,10 @@ typedef struct st_typelib { /* Different types saved here */ } TYPELIB; extern my_ulonglong find_typeset(char *x, TYPELIB *typelib,int *error_position); -extern int find_type_or_exit(const char *x, TYPELIB *typelib, - const char *option); +extern int find_type_with_warning(const char *x, TYPELIB *typelib, + const char *option); +extern uint find_type_or_exit(const char *x, TYPELIB *typelib, + const char *option); extern int find_type(char *x, const TYPELIB *typelib, unsigned int full_name); extern void make_type(char *to,unsigned int nr,TYPELIB *typelib); extern const char *get_type(TYPELIB *typelib,unsigned int nr); diff --git a/include/violite.h b/include/violite.h index d49d0302b5e..ef073592afe 100644 --- a/include/violite.h +++ b/include/violite.h @@ -88,6 +88,7 @@ my_bool vio_peer_addr(Vio* vio, char *buf, uint16 *port); /* Remotes in_addr */ void vio_in_addr(Vio *vio, struct in_addr *in); my_bool vio_poll_read(Vio *vio,uint timeout); +ssize_t vio_pending(Vio *vio); #ifdef HAVE_OPENSSL #include <openssl/opensslv.h> |