diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/config-win.h | 36 | ||||
| -rw-r--r-- | include/maria.h | 5 | ||||
| -rw-r--r-- | include/my_dbug.h | 1 | ||||
| -rw-r--r-- | include/my_global.h | 6 | ||||
| -rw-r--r-- | include/my_pthread.h | 2 | ||||
| -rw-r--r-- | include/mysql.h.pp | 6 | ||||
| -rw-r--r-- | include/mysql_version.h.in | 1 | ||||
| -rw-r--r-- | include/typelib.h | 6 | ||||
| -rw-r--r-- | include/violite.h | 1 |
10 files changed, 55 insertions, 11 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 6ace3b6acf8..516fdeee392 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -59,6 +59,8 @@ link_sources: # We want both "my_config.h" and "config.h" that are identical, as # MySQL sources assumes the name "my_config.h", and 3rd party sources # assumes the name "config.h". +# Normally this is generated by configure; This rule is left here in case +# someone deletes my_config.h and expect it to be generated by make my_config.h: config.h $(CP) config.h my_config.h diff --git a/include/config-win.h b/include/config-win.h index f054185ec8a..bab774e9077 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -93,6 +93,17 @@ functions */ #define S_IROTH S_IREAD /* for my_lib */ +/* for MY_S_ISFIFO() macro from my_lib */ +#if defined (_S_IFIFO) && !defined (S_IFIFO) +#define S_IFIFO _S_IFIFO +#endif + +/* Winsock2 constant (Vista SDK and later)*/ +#define IPPROTO_IPV6 41 +#ifndef IPV6_V6ONLY +#define IPV6_V6ONLY 27 +#endif + /* Constants used by chmod. Note, that group/others is ignored - because unsupported by Windows due to different access control model. @@ -159,10 +170,21 @@ typedef __int64 os_off_t; #ifdef _WIN64 typedef UINT_PTR rf_SetTimer; #else +typedef uint rf_SetTimer; +#endif + #ifndef HAVE_SIZE_T -typedef unsigned int size_t; +#ifndef _SIZE_T_DEFINED +typedef SIZE_T size_t; +#define _SIZE_T_DEFINED +#endif +#endif + +#ifndef HAVE_SSIZE_T +#ifndef _SSIZE_T_DEFINED +typedef SSIZE_T ssize_t; +#define _SSIZE_T_DEFINED #endif -typedef uint rf_SetTimer; #endif #define Socket_defined @@ -194,7 +216,7 @@ typedef uint rf_SetTimer; #define SIZEOF_CHARP 4 #endif #define HAVE_BROKEN_NETINET_INCLUDES -#ifdef __NT__ +#ifdef _WIN32 #define HAVE_NAMED_PIPE /* We can only create pipes on NT */ #endif @@ -307,7 +329,7 @@ inline ulonglong double2ulonglong(double d) #define strcasecmp stricmp #define strncasecmp strnicmp -#ifndef __NT__ +#ifndef _WIN32 #undef FILE_SHARE_DELETE #define FILE_SHARE_DELETE 0 /* Not implemented on Win 98/ME */ #endif @@ -359,7 +381,7 @@ inline ulonglong double2ulonglong(double d) #define thread_safe_increment(V,L) InterlockedIncrement((long*) &(V)) #define thread_safe_decrement(V,L) InterlockedDecrement((long*) &(V)) /* The following is only used for statistics, so it should be good enough */ -#ifdef __NT__ /* This should also work on Win98 but .. */ +#ifdef _WIN32 /* This should also work on Win98 but .. */ #define thread_safe_add(V,C,L) InterlockedExchangeAdd((long*) &(V),(C)) #define thread_safe_sub(V,C,L) InterlockedExchangeAdd((long*) &(V),-(long) (C)) #endif @@ -427,3 +449,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/maria.h b/include/maria.h index d14ca10e9b5..3c2fc08d9a8 100644 --- a/include/maria.h +++ b/include/maria.h @@ -162,6 +162,7 @@ struct st_maria_handler; /* For referense */ typedef struct st_maria_handler MARIA_HA; struct st_maria_s_param; struct st_maria_keydef; +struct st_maria_page; typedef struct st_maria_key /* Internal info about a key */ { @@ -195,7 +196,7 @@ typedef struct st_maria_keydef /* Key definition with open & info */ HA_KEYSEG *seg, *end; struct st_mysql_ftparser *parser; /* Fulltext [pre]parser */ - int (*bin_search)(const MARIA_KEY *key, uchar *page, + int (*bin_search)(const MARIA_KEY *key, const struct st_maria_page *page, uint32 comp_flag, uchar **ret_pos, uchar *buff, my_bool *was_last_key); uint (*get_key)(MARIA_KEY *key, uint page_flag, uint nod_flag, @@ -208,7 +209,7 @@ typedef struct st_maria_keydef /* Key definition with open & info */ void (*store_key)(struct st_maria_keydef *keyinfo, uchar *key_pos, struct st_maria_s_param *s_temp); my_bool (*ck_insert)(MARIA_HA *inf, MARIA_KEY *key); - int (*ck_delete)(MARIA_HA *inf, MARIA_KEY *klen); + my_bool (*ck_delete)(MARIA_HA *inf, MARIA_KEY *klen); MARIA_KEY *(*make_key)(MARIA_HA *info, MARIA_KEY *int_key, uint keynr, uchar *key, const uchar *record, MARIA_RECORD_POS filepos, ulonglong trid); 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/my_global.h b/include/my_global.h index 76fb6ba34e3..f14204cf215 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -572,6 +572,12 @@ int __void__; #define PURIFY_OR_LINT_INIT(var) #endif +#ifdef HAVE_purify +#define IF_PURIFY(A,B) (A) +#else +#define IF_PURIFY(A,B) (B) +#endif + #if !defined(HAVE_UINT) #undef HAVE_UINT #define HAVE_UINT diff --git a/include/my_pthread.h b/include/my_pthread.h index f7d81f95107..ea5ca8d10d5 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -680,6 +680,8 @@ extern const char *my_thread_name(void); extern my_thread_id my_thread_dbug_id(void); extern int pthread_no_free(void *); extern int pthread_dummy(int); +extern void my_mutex_init(); +extern void my_mutex_end(); /* All thread specific variables are in the following struct */ 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/mysql_version.h.in b/include/mysql_version.h.in index 04a43f2c968..c37e99d7a8c 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -11,6 +11,7 @@ #define PROTOCOL_VERSION @PROTOCOL_VERSION@ #define MYSQL_SERVER_VERSION "@VERSION@" #define MYSQL_BASE_VERSION "mysqld-@MYSQL_BASE_VERSION@" +#define MARIADB_BASE_VERSION "mariadb-@MYSQL_BASE_VERSION@" #define MYSQL_SERVER_SUFFIX_DEF "@MYSQL_SERVER_SUFFIX@" #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ 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> |