diff options
| author | stewart@willster.(none) <> | 2007-01-24 16:24:21 +1100 |
|---|---|---|
| committer | stewart@willster.(none) <> | 2007-01-24 16:24:21 +1100 |
| commit | b0d94e9d358a620ab3d96350e7396cd54ee0726b (patch) | |
| tree | 0bdc412eef2e62ad2bb079d4a277c25dbbc9cb4c | |
| parent | f869a0d6052e7b5d7fc9157b4d50ebecac969e86 (diff) | |
| parent | 4889ea232130b9671333f06dd0a5b948c3ee5c49 (diff) | |
| download | mariadb-git-b0d94e9d358a620ab3d96350e7396cd54ee0726b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
| -rw-r--r-- | ndb/src/common/util/SocketClient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/common/util/SocketClient.cpp b/ndb/src/common/util/SocketClient.cpp index ec35fd3eb90..c2825901929 100644 --- a/ndb/src/common/util/SocketClient.cpp +++ b/ndb/src/common/util/SocketClient.cpp @@ -109,7 +109,7 @@ SocketClient::connect(const char *toaddress, unsigned short toport) 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 @@ SocketClient::connect(const char *toaddress, unsigned short toport) 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); |