bzr commit into mysql-5.1 branch (tomas.ulin:3197) Bug#41918

[Tomas Ulin]

#At file:///home/tomas/mysql_src/mysql-5.1-telco-6.4/

 3197 Tomas Ulin	2009-01-08
      Bug #41918  Error in sql/mysqld.cc
modified:
  sql/mysqld.cc

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-11-26 12:58:35 +0000
+++ b/sql/mysqld.cc	2009-01-08 10:20:38 +0000
@@ -4948,7 +4948,7 @@ pthread_handler_t handle_connections_soc
 
 #ifdef HAVE_LIBWRAP
     {
-      if (sock == ip_sock)
+      if (sock.fd == ip_sock.fd)
       {
 	struct request_info req;
 	signal(SIGCHLD, SIG_DFL);
@@ -4973,7 +4973,7 @@ pthread_handler_t handle_connections_soc
 	  if (req.sink)
 	    ((void (*)(int))req.sink)(req.fd);
 
-	  (void) shutdown(new_sock, SHUT_RDWR);
+	  (void) shutdown(new_sock.fd, SHUT_RDWR);
 	  (void) closesocket(new_sock);
 	  continue;
 	}