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 outpost.site:/home/cps/mysql/trees/5.0-runtime-19044

Browse source 
into  outpost.site:/home/cps/mysql/trees/5.1-runtime-19044
This commit is contained in:
petr/cps@outpost.site 2006-12-04 19:50:11 +03:00
commit be73ce226a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server-tools/instance-manager/listener.cc
View file

@ -154,7 +154,7 @@ void Listener::run()
else
{
shutdown(client_fd, SHUT_RDWR);
close(client_fd);
closesocket(client_fd);
}
}
}
@ -166,7 +166,7 @@ void Listener::run()
log_info("Listener: shutdown requested, exiting...");
for (i= 0; i < num_sockets; i++)
close(sockets[i]);
closesocket(sockets[i]);
#ifndef __WIN__
unlink(unix_socket_address.sun_path);
@ -180,7 +180,7 @@ void Listener::run()
err:
// we have to close the ip sockets in case of error
for (i= 0; i < num_sockets; i++)
close(sockets[i]);
closesocket(sockets[i]);
thread_registry->unregister_thread(&thread_info);
thread_registry->request_shutdown();
@ -228,7 +228,7 @@ int Listener::create_tcp_socket()
{
log_error("Listener: bind(ip socket) failed: %s.",
(const char *) strerror(errno));
close(ip_socket);
closesocket(ip_socket);
return -1;
}
@ -236,7 +236,7 @@ int Listener::create_tcp_socket()
{
log_error("Listener: listen(ip socket) failed: %s.",
(const char *) strerror(errno));
close(ip_socket);
closesocket(ip_socket);
return -1;
}