database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Code Activity

References lp:1115708 - merged with wsrep branch, revision 3845

Browse Source 
bzr merge -r3840..3845 lp:~codership/codership-mysql/5.5-23
This commit is contained in:
Seppo Jaakola
2013-02-05 22:48:40 +02:00
parent 18c97eea5c
commit e51a884e9c
9 changed files with 202 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/mysqld.cc
View File

@@ -2363,6 +2363,9 @@ static my_socket activate_tcp_port(uint port)
socket_errno);
unireg_abort(1);
}
#if defined(WITH_WSREP) && defined(HAVE_FCNTL)
(void) fcntl(ip_sock, F_SETFD, FD_CLOEXEC);
#endif /* WITH_WSREP */
DBUG_RETURN(ip_sock);
}
@@ -2484,6 +2487,9 @@ static void network_init(void)
if (listen(unix_sock,(int) back_log) < 0)
sql_print_warning("listen() on Unix socket failed with error %d",
socket_errno);
#if defined(WITH_WSREP) && defined(HAVE_FCNTL)
(void) fcntl(unix_sock, F_SETFD, FD_CLOEXEC);
#endif /* WITH_WSREP */
}
#endif
DBUG_PRINT("info",("server started"));
@@ -6366,6 +6372,9 @@ void handle_connections_sockets()
sleep(1); // Give other threads some time
continue;
}
#if defined(WITH_WSREP) && defined(HAVE_FCNTL)
(void) fcntl(new_sock, F_SETFD, FD_CLOEXEC);
#endif /* WITH_WSREP */
#ifdef HAVE_LIBWRAP
{