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 branch '10.0-galera' into 10.1

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2018-06-12 19:39:37 +03:00
parent aa59ecec89 215d652c66
commit 6e55236c0a
51 changed files with 590 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,6 +562,12 @@ inline_mysql_socket_socket
(key, (const my_socket*)&mysql_socket.fd, NULL, 0);
}
#endif
/* SOCK_CLOEXEC isn't always a number - can't preprocessor compare */
#if defined(HAVE_FCNTL) && defined(FD_CLOEXEC) && !defined(HAVE_SOCK_CLOEXEC)
(void) fcntl(mysql_socket.fd, F_SETFD, FD_CLOEXEC);
#endif
return mysql_socket;
}