mirror of
https://github.com/MariaDB/server.git
synced 2025-01-28 09:44:17 +01:00
Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown
This commit is contained in:
parent
ef218ff99d
commit
3860571e95
2 changed files with 9 additions and 9 deletions
|
@ -713,7 +713,7 @@ static void close_connections(void)
|
||||||
{
|
{
|
||||||
if (ip_sock != INVALID_SOCKET)
|
if (ip_sock != INVALID_SOCKET)
|
||||||
{
|
{
|
||||||
(void) shutdown(ip_sock,2);
|
(void) shutdown(ip_sock, SHUT_RDWR);
|
||||||
(void) closesocket(ip_sock);
|
(void) closesocket(ip_sock);
|
||||||
ip_sock= INVALID_SOCKET;
|
ip_sock= INVALID_SOCKET;
|
||||||
}
|
}
|
||||||
|
@ -745,7 +745,7 @@ static void close_connections(void)
|
||||||
#ifdef HAVE_SYS_UN_H
|
#ifdef HAVE_SYS_UN_H
|
||||||
if (unix_sock != INVALID_SOCKET)
|
if (unix_sock != INVALID_SOCKET)
|
||||||
{
|
{
|
||||||
(void) shutdown(unix_sock,2);
|
(void) shutdown(unix_sock, SHUT_RDWR);
|
||||||
(void) closesocket(unix_sock);
|
(void) closesocket(unix_sock);
|
||||||
(void) unlink(mysqld_unix_port);
|
(void) unlink(mysqld_unix_port);
|
||||||
unix_sock= INVALID_SOCKET;
|
unix_sock= INVALID_SOCKET;
|
||||||
|
@ -848,7 +848,7 @@ static void close_server_sock()
|
||||||
{
|
{
|
||||||
ip_sock=INVALID_SOCKET;
|
ip_sock=INVALID_SOCKET;
|
||||||
DBUG_PRINT("info",("calling shutdown on TCP/IP socket"));
|
DBUG_PRINT("info",("calling shutdown on TCP/IP socket"));
|
||||||
VOID(shutdown(tmp_sock,2));
|
VOID(shutdown(tmp_sock, SHUT_RDWR));
|
||||||
#if defined(__NETWARE__)
|
#if defined(__NETWARE__)
|
||||||
/*
|
/*
|
||||||
The following code is disabled for normal systems as it causes MySQL
|
The following code is disabled for normal systems as it causes MySQL
|
||||||
|
@ -863,7 +863,7 @@ static void close_server_sock()
|
||||||
{
|
{
|
||||||
unix_sock=INVALID_SOCKET;
|
unix_sock=INVALID_SOCKET;
|
||||||
DBUG_PRINT("info",("calling shutdown on unix socket"));
|
DBUG_PRINT("info",("calling shutdown on unix socket"));
|
||||||
VOID(shutdown(tmp_sock,2));
|
VOID(shutdown(tmp_sock, SHUT_RDWR));
|
||||||
#if defined(__NETWARE__)
|
#if defined(__NETWARE__)
|
||||||
/*
|
/*
|
||||||
The following code is disabled for normal systems as it may cause MySQL
|
The following code is disabled for normal systems as it may cause MySQL
|
||||||
|
@ -4088,7 +4088,7 @@ pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused)))
|
||||||
if (req.sink)
|
if (req.sink)
|
||||||
((void (*)(int))req.sink)(req.fd);
|
((void (*)(int))req.sink)(req.fd);
|
||||||
|
|
||||||
(void) shutdown(new_sock,2);
|
(void) shutdown(new_sock, SHUT_RDWR);
|
||||||
(void) closesocket(new_sock);
|
(void) closesocket(new_sock);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -4103,7 +4103,7 @@ pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused)))
|
||||||
if (getsockname(new_sock,&dummy, &dummyLen) < 0)
|
if (getsockname(new_sock,&dummy, &dummyLen) < 0)
|
||||||
{
|
{
|
||||||
sql_perror("Error on new connection socket");
|
sql_perror("Error on new connection socket");
|
||||||
(void) shutdown(new_sock,2);
|
(void) shutdown(new_sock, SHUT_RDWR);
|
||||||
(void) closesocket(new_sock);
|
(void) closesocket(new_sock);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -4115,7 +4115,7 @@ pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused)))
|
||||||
|
|
||||||
if (!(thd= new THD))
|
if (!(thd= new THD))
|
||||||
{
|
{
|
||||||
(void) shutdown(new_sock,2);
|
(void) shutdown(new_sock, SHUT_RDWR);
|
||||||
VOID(closesocket(new_sock));
|
VOID(closesocket(new_sock));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -4129,7 +4129,7 @@ pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused)))
|
||||||
vio_delete(vio_tmp);
|
vio_delete(vio_tmp);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
(void) shutdown(new_sock,2);
|
(void) shutdown(new_sock, SHUT_RDWR);
|
||||||
(void) closesocket(new_sock);
|
(void) closesocket(new_sock);
|
||||||
}
|
}
|
||||||
delete thd;
|
delete thd;
|
||||||
|
|
|
@ -276,7 +276,7 @@ int vio_close(Vio * vio)
|
||||||
if (vio->type != VIO_CLOSED)
|
if (vio->type != VIO_CLOSED)
|
||||||
{
|
{
|
||||||
DBUG_ASSERT(vio->sd >= 0);
|
DBUG_ASSERT(vio->sd >= 0);
|
||||||
if (shutdown(vio->sd,2))
|
if (shutdown(vio->sd, SHUT_RDWR))
|
||||||
r= -1;
|
r= -1;
|
||||||
if (closesocket(vio->sd))
|
if (closesocket(vio->sd))
|
||||||
r= -1;
|
r= -1;
|
||||||
|
|
Loading…
Add table
Reference in a new issue