diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-14 17:23:34 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-14 17:23:34 +0300 |
| commit | 60589aeee03949033c66da5c1eae70d4342179fc (patch) | |
| tree | 1cd399dbed17c5c7b4ed16eb7b872dc979af1c93 /include/my_global.h | |
| parent | b39e6e3d093b45f792959ef06fea1c175263ae1a (diff) | |
| download | mariadb-git-60589aeee03949033c66da5c1eae70d4342179fc.tar.gz | |
Next part of merge. See TODO for details
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/include/my_global.h b/include/my_global.h index 6fcaa258f21..fa9ce649543 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -90,17 +90,6 @@ #define IF_WIN(A,B) B #endif -#ifndef EMBEDDED_LIBRARY -#ifdef WITH_NDB_BINLOG -#define HAVE_NDB_BINLOG 1 -#endif -#endif /* !EMBEDDED_LIBRARY */ - -#ifndef EMBEDDED_LIBRARY -#define HAVE_REPLICATION -#define HAVE_EXTERNAL_CLIENT -#endif - #if defined (_WIN32) /* off_t is 32 bit long. We do not use C runtime functions @@ -1018,6 +1007,7 @@ typedef struct st_mysql_lex_string LEX_STRING; #define SOCKET_ETIMEDOUT WSAETIMEDOUT #define SOCKET_EWOULDBLOCK WSAEWOULDBLOCK #define SOCKET_EADDRINUSE WSAEADDRINUSE +#define SOCKET_ECONNRESET WSAECONNRESET #define SOCKET_ENFILE ENFILE #define SOCKET_EMFILE EMFILE #else /* Unix */ @@ -1028,6 +1018,7 @@ typedef struct st_mysql_lex_string LEX_STRING; #define SOCKET_ETIMEDOUT SOCKET_EINTR #define SOCKET_EWOULDBLOCK EWOULDBLOCK #define SOCKET_EADDRINUSE EADDRINUSE +#define SOCKET_ECONNRESET ECONNRESET #define SOCKET_ENFILE ENFILE #define SOCKET_EMFILE EMFILE #endif @@ -1541,6 +1532,12 @@ static inline double rint(double x) #undef HAVE_SMEM /* No shared memory */ +#else +#ifdef WITH_NDB_BINLOG +#define HAVE_NDB_BINLOG 1 +#endif +#define HAVE_REPLICATION +#define HAVE_EXTERNAL_CLIENT #endif /* EMBEDDED_LIBRARY */ #endif /* my_global_h */ |