bk commit into 5.0 tree (stewart:1.2370)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-24 16:12:39+11:00, stewart@willster.(none) +1 -0
  fix hpux build problem and some ndb connect errors being missed

  ndb/src/common/util/SocketClient.cpp@stripped, 2007-01-24 16:12:37+11:00, stewart@willster.(none) +2 -2
    fix two problems recently introduced:
    - HPUX build problem
    - some connect errors not being detected properly

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/ndb-work

--- 1.10/ndb/src/common/util/SocketClient.cpp	2007-01-23 17:06:32 +11:00
+++ 1.11/ndb/src/common/util/SocketClient.cpp	2007-01-24 16:12:37 +11:00
@@ -109,7 +109,7 @@
   struct timeval tval;
   int r;
   bool use_timeout;
-  socklen_t len;
+  SOCKOPT_OPTLEN_TYPE len;
   int flags;
 
   if (m_sockfd == NDB_INVALID_SOCKET)
@@ -168,7 +168,7 @@
   if (FD_ISSET(m_sockfd, &rset) || FD_ISSET(m_sockfd, &wset))
   {
     len= sizeof(r);
-    if (getsockopt(m_sockfd, SOL_SOCKET, SO_ERROR, &r, &len) < 0)
+    if (getsockopt(m_sockfd, SOL_SOCKET, SO_ERROR, &r, &len) < 0 || r)
     {
       // Solaris got an error... different than others
       NDB_CLOSE_SOCKET(m_sockfd);