diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 4 | ||||
| -rw-r--r-- | include/my_global.h | 4 | ||||
| -rw-r--r-- | include/my_net.h | 9 | ||||
| -rw-r--r-- | include/my_pthread.h | 1 | ||||
| -rw-r--r-- | include/my_sys.h | 1 | ||||
| -rw-r--r-- | include/mysql_com.h | 2 | ||||
| -rw-r--r-- | include/mysys_err.h | 3 |
7 files changed, 18 insertions, 6 deletions
diff --git a/include/config-win.h b/include/config-win.h index 884b2edfb63..4fdbfbbd02f 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -183,8 +183,8 @@ inline double rint(double nr) } #ifdef _WIN64 -#define ulonglong2double(A) ((double) (A)) -#define my_off_t2double(A) ((double) (A)) +#define ulonglong2double(A) ((double) (ulonglong) (A)) +#define my_off_t2double(A) ((double) (my_off_t) (A)) #else inline double ulonglong2double(ulonglong value) diff --git a/include/my_global.h b/include/my_global.h index 73287a2ba2a..43cacf8fa65 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -594,8 +594,8 @@ extern double my_atof(const char*); #define closesocket(A) close(A) #endif #ifndef ulonglong2double -#define ulonglong2double(A) ((double) (A)) -#define my_off_t2double(A) ((double) (A)) +#define ulonglong2double(A) ((double) (ulonglong) (A)) +#define my_off_t2double(A) ((double) (my_off_t) (A)) #endif #endif diff --git a/include/my_net.h b/include/my_net.h index 28d862d8528..7b42afa1f3a 100644 --- a/include/my_net.h +++ b/include/my_net.h @@ -63,6 +63,15 @@ C_MODE_START #define O_NONBLOCK 1 /* For emulation of fcntl() */ #endif +/* + On OSes which don't have the in_addr_t, we guess that using uint32 is the best + possible choice. We guess this from the fact that on HP-UX64bit & FreeBSD64bit + & Solaris64bit, in_addr_t is equivalent to uint32. And on Linux32bit too. +*/ +#ifndef HAVE_IN_ADDR_T +#define in_addr_t uint32 +#endif + /* Thread safe or portable version of some functions */ void my_inet_ntoa(struct in_addr in, char *buf); diff --git a/include/my_pthread.h b/include/my_pthread.h index 82a2bb1accc..a4ea88b20f0 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -645,6 +645,7 @@ struct st_my_thread_var long id; int cmp_length; int volatile abort; + my_bool init; struct st_my_thread_var *next,**prev; void *opt_info; #ifndef DBUG_OFF diff --git a/include/my_sys.h b/include/my_sys.h index c404e54c2a9..6082b988822 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -614,6 +614,7 @@ extern FILE *my_fopen(const char *FileName,int Flags,myf MyFlags); extern FILE *my_fdopen(File Filedes,const char *name, int Flags,myf MyFlags); extern int my_fclose(FILE *fd,myf MyFlags); extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags); +extern int my_sync(File fd, myf my_flags); extern int my_error _VARARGS((int nr,myf MyFlags, ...)); extern int my_printf_error _VARARGS((uint my_err, const char *format, myf MyFlags, ...) diff --git a/include/mysql_com.h b/include/mysql_com.h index be8db185737..f4b6114c8d4 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -33,7 +33,7 @@ #if defined(__WIN__) && !defined( _CUSTOMCONFIG_) #define MYSQL_NAMEDPIPE "MySQL" -#define MYSQL_SERVICENAME "MySql" +#define MYSQL_SERVICENAME "MySQL" #endif /* __WIN__ */ enum enum_server_command diff --git a/include/mysys_err.h b/include/mysys_err.h index a86765c74fd..0ee89e91ee4 100644 --- a/include/mysys_err.h +++ b/include/mysys_err.h @@ -21,7 +21,7 @@ extern "C" { #endif #define GLOB 0 /* Error maps */ -#define GLOBERRS 27 /* Max number of error messages in map's */ +#define GLOBERRS 28 /* Max number of error messages in map's */ #define EE(X) globerrs[ X ] /* Defines to add error to right map */ extern const char * NEAR globerrs[]; /* my_error_messages is here */ @@ -53,6 +53,7 @@ extern const char * NEAR globerrs[]; /* my_error_messages is here */ #define EE_CANT_READLINK 24 #define EE_CANT_SYMLINK 25 #define EE_REALPATH 26 +#define EE_SYNC 27 /* exit codes for all MySQL programs */ |