diff options
| author | Alexander Barkov <bar@mariadb.org> | 2015-12-29 19:37:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2015-12-29 19:37:11 +0400 |
| commit | 2ba7ed77aab05004f0c853a77850e325b78a1892 (patch) | |
| tree | 943659d76215e16d0d1946c28683c562debeff34 /include/mysql/psi/mysql_socket.h | |
| parent | 63f0669fd6dc430b60ffd5de0bff9854622a1c1a (diff) | |
| parent | 1bb66ea88c4679d6bd3ad1472d75983e66f679ae (diff) | |
| download | mariadb-git-2ba7ed77aab05004f0c853a77850e325b78a1892.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
Diffstat (limited to 'include/mysql/psi/mysql_socket.h')
| -rw-r--r-- | include/mysql/psi/mysql_socket.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h index baab19785b9..202dc636eee 100644 --- a/include/mysql/psi/mysql_socket.h +++ b/include/mysql/psi/mysql_socket.h @@ -149,7 +149,7 @@ MYSQL_SOCKET socket __attribute__ ((unused)) /** MYSQL_SOCKET helper. Get socket descriptor. @param mysql_socket Instrumented socket - @sa mysql_socket_setfd + @sa mysql_socket_getfd */ static inline my_socket mysql_socket_getfd(MYSQL_SOCKET mysql_socket) @@ -161,7 +161,7 @@ mysql_socket_getfd(MYSQL_SOCKET mysql_socket) MYSQL_SOCKET helper. Set socket descriptor. @param mysql_socket Instrumented socket @param fd Socket descriptor - @sa mysql_socket_getfd + @sa mysql_socket_setfd */ static inline void mysql_socket_setfd(MYSQL_SOCKET *mysql_socket, my_socket fd) @@ -1013,7 +1013,9 @@ inline_mysql_socket_accept #endif MYSQL_SOCKET socket_listen, struct sockaddr *addr, socklen_t *addr_len) { +#ifdef FD_CLOEXEC int flags __attribute__ ((unused)); +#endif MYSQL_SOCKET socket_accept= MYSQL_INVALID_SOCKET; socklen_t addr_length= (addr_len != NULL) ? *addr_len : 0; |