bzr push into mysql-5.1 branch (stewart:2828 to 2829)

[Stewart Smith]

 2829 Stewart Smith	2008-09-02
      fix part of mysqld only built on OSX not yet updated for struct my_socket
modified:
  sql/mysqld.cc

 2828 Stewart Smith	2008-09-01
      include headers in my_socket_posix.h required on OSX
modified:
  include/my_socket_posix.h

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-08-22 04:27:37 +0000
+++ b/sql/mysqld.cc	2008-09-02 03:09:34 +0000
@@ -4822,9 +4822,9 @@ inline void kill_broken_server()
   /* hack to get around signals ignored in syscalls for problem OS's */
   if (
 #if !defined(__NETWARE__)
-      unix_sock == INVALID_SOCKET ||
+      !my_socket_valid(unix_sock) ||
 #endif
-      (!opt_disable_networking && ip_sock == INVALID_SOCKET))
+      (!opt_disable_networking && !my_socket_valid(ip_sock)))
   {
     select_thread_in_use = 0;
     /* The following call will never return */