mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge shellback.(none):/home/msvensson/mysql/work/my51-work

Browse source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
This commit is contained in:
msvensson@shellback.(none) 2006-09-15 14:39:55 +02:00
commit d4cb04fc05
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sql/mysqld.cc
View file

@ -782,7 +782,7 @@ static void close_connections(void)
{
if (ip_sock != INVALID_SOCKET)
{
(void) shutdown(ip_sock,2);
(void) shutdown(ip_sock, SHUT_RDWR);
(void) closesocket(ip_sock);
ip_sock= INVALID_SOCKET;
}
@ -814,7 +814,7 @@ static void close_connections(void)
#ifdef HAVE_SYS_UN_H
if (unix_sock != INVALID_SOCKET)
{
(void) shutdown(unix_sock,2);
(void) shutdown(unix_sock, SHUT_RDWR);
(void) closesocket(unix_sock);
(void) unlink(mysqld_unix_port);
unix_sock= INVALID_SOCKET;
@ -918,7 +918,7 @@ static void close_server_sock()
{
ip_sock=INVALID_SOCKET;
DBUG_PRINT("info",("calling shutdown on TCP/IP socket"));
VOID(shutdown(tmp_sock,2));
VOID(shutdown(tmp_sock, SHUT_RDWR));
#if defined(__NETWARE__)
/*
The following code is disabled for normal systems as it causes MySQL
@ -933,7 +933,7 @@ static void close_server_sock()
{
unix_sock=INVALID_SOCKET;
DBUG_PRINT("info",("calling shutdown on unix socket"));
VOID(shutdown(tmp_sock,2));
VOID(shutdown(tmp_sock, SHUT_RDWR));
#if defined(__NETWARE__)
/*
The following code is disabled for normal systems as it may cause MySQL
@ -4237,7 +4237,7 @@ pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused)))
if (req.sink)
((void (*)(int))req.sink)(req.fd);
(void) shutdown(new_sock,2);
(void) shutdown(new_sock, SHUT_RDWR);
(void) closesocket(new_sock);
continue;
}
@ -4252,7 +4252,7 @@ pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused)))
if (getsockname(new_sock,&dummy, &dummyLen) < 0)
{
sql_perror("Error on new connection socket");
(void) shutdown(new_sock,2);
(void) shutdown(new_sock, SHUT_RDWR);
(void) closesocket(new_sock);
continue;
}
@ -4264,7 +4264,7 @@ pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused)))
if (!(thd= new THD))
{
(void) shutdown(new_sock,2);
(void) shutdown(new_sock, SHUT_RDWR);
VOID(closesocket(new_sock));
continue;
}
@ -4278,7 +4278,7 @@ pthread_handler_t handle_connections_sockets(void *arg __attribute__((unused)))
vio_delete(vio_tmp);
else
{
(void) shutdown(new_sock,2);
(void) shutdown(new_sock, SHUT_RDWR);
(void) closesocket(new_sock);
}
delete thd;

2
vio/viosocket.c
View file

@ -275,7 +275,7 @@ int vio_close(Vio * vio)
if (vio->type != VIO_CLOSED)
{
DBUG_ASSERT(vio->sd >= 0);
if (shutdown(vio->sd,2))
if (shutdown(vio->sd, SHUT_RDWR))
r= -1;
if (closesocket(vio->sd))
r= -1;