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

Merge remote-tracking branch 'origin/10.1' into 10.2

Browse Source
This commit is contained in:
Alexander Barkov
2015-12-29 19:37:11 +04:00
parent 63f0669fd6 1bb66ea88c
commit 2ba7ed77aa
3663 changed files with 643591 additions and 222259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;