Commit a309ff22 authored by unknown's avatar unknown
Browse files

Merge outpost.site:/home/cps/mysql/trees/5.0-runtime-19044 

into  outpost.site:/home/cps/mysql/trees/5.1-runtime-19044


server-tools/instance-manager/listener.cc:
  Auto merged
parents 42518395 1adc1368

server-tools/instance-manager/listener.cc

+5 −5
Original line number Diff line number Diff line
@@ -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;

  }