database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

compilation failures on Windows

Browse Source
This commit is contained in:
Sergei Golubchik
2015-07-23 10:55:24 +02:00
parent 0ae8bae98f
commit 26f249f6db
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mysql/psi/mysql_socket.h
View File

@@ -1033,11 +1033,13 @@ inline_mysql_socket_accept
SOCK_CLOEXEC); SOCK_CLOEXEC);
#else #else
socket_accept.fd= accept(socket_listen.fd, addr, &addr_length); socket_accept.fd= accept(socket_listen.fd, addr, &addr_length);
#ifdef FD_CLOEXEC
flags= fcntl(socket_accept.fd, F_GETFD); flags= fcntl(socket_accept.fd, F_GETFD);
if (flags != -1) { if (flags != -1) {
flags |= FD_CLOEXEC; flags |= FD_CLOEXEC;
fcntl(socket_accept.fd, F_SETFD, flags); fcntl(socket_accept.fd, F_SETFD, flags);
} }
#endif
#endif #endif
/* Instrumentation end */ /* Instrumentation end */
@@ -1053,11 +1055,13 @@ inline_mysql_socket_accept
SOCK_CLOEXEC); SOCK_CLOEXEC);
#else #else
socket_accept.fd= accept(socket_listen.fd, addr, &addr_length); socket_accept.fd= accept(socket_listen.fd, addr, &addr_length);
#ifdef FD_CLOEXEC
flags= fcntl(socket_accept.fd, F_GETFD); flags= fcntl(socket_accept.fd, F_GETFD);
if (flags != -1) { if (flags != -1) {
flags |= FD_CLOEXEC; flags |= FD_CLOEXEC;
fcntl(socket_accept.fd, F_SETFD, flags); fcntl(socket_accept.fd, F_SETFD, flags);
} }
#endif
#endif #endif
} }

5
sql/wsrep_xid.h
View File

@@ -17,11 +17,12 @@
#define WSREP_XID_H #define WSREP_XID_H
#include <my_config.h> #include <my_config.h>
#include "../wsrep/wsrep_api.h"
#include "handler.h" // XID typedef
#ifdef WITH_WSREP #ifdef WITH_WSREP
#include "../wsrep/wsrep_api.h"
#include "handler.h" // XID typedef
void wsrep_xid_init(xid_t*, const wsrep_uuid_t&, wsrep_seqno_t); void wsrep_xid_init(xid_t*, const wsrep_uuid_t&, wsrep_seqno_t);
const wsrep_uuid_t* wsrep_xid_uuid(const XID&); const wsrep_uuid_t* wsrep_xid_uuid(const XID&);
wsrep_seqno_t wsrep_xid_seqno(const XID&); wsrep_seqno_t wsrep_xid_seqno(const XID&);