diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 14:51:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-15 14:51:22 +0300 |
| commit | e67daa5653490074850bc9f5d2deef58f2a10d8e (patch) | |
| tree | cf631a1ff96be08423d909702ca3558fda6e56c0 /include | |
| parent | eb2eaba7fdbd13c9814ab4619cc23d9f140e5485 (diff) | |
| parent | ced3ec4c9ce0853c564532fbe90656cf1c3c2bed (diff) | |
| download | mariadb-git-e67daa5653490074850bc9f5d2deef58f2a10d8e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql/psi/mysql_socket.h | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/include/mysql/psi/mysql_socket.h b/include/mysql/psi/mysql_socket.h index 765c5aa7793..aa85daaaab1 100644 --- a/include/mysql/psi/mysql_socket.h +++ b/include/mysql/psi/mysql_socket.h @@ -1135,10 +1135,14 @@ inline_mysql_socket_accept #else socket_accept.fd= accept(socket_listen.fd, addr, addr_len); #ifdef FD_CLOEXEC - flags= fcntl(socket_accept.fd, F_GETFD); - if (flags != -1) { - flags |= FD_CLOEXEC; - fcntl(socket_accept.fd, F_SETFD, flags); + if (socket_accept.fd != INVALID_SOCKET) + { + flags= fcntl(socket_accept.fd, F_GETFD); + if (flags != -1) + { + flags |= FD_CLOEXEC; + fcntl(socket_accept.fd, F_SETFD, flags); + } } #endif #endif @@ -1156,10 +1160,14 @@ inline_mysql_socket_accept #else socket_accept.fd= accept(socket_listen.fd, addr, addr_len); #ifdef FD_CLOEXEC - flags= fcntl(socket_accept.fd, F_GETFD); - if (flags != -1) { - flags |= FD_CLOEXEC; - fcntl(socket_accept.fd, F_SETFD, flags); + if (socket_accept.fd != INVALID_SOCKET) + { + flags= fcntl(socket_accept.fd, F_GETFD); + if (flags != -1) + { + flags |= FD_CLOEXEC; + fcntl(socket_accept.fd, F_SETFD, flags); + } } #endif #endif |