diff options
| author | df@kahlann.erinye.com <> | 2007-01-24 09:24:29 +0100 |
|---|---|---|
| committer | df@kahlann.erinye.com <> | 2007-01-24 09:24:29 +0100 |
| commit | 729f0158669cb4dc7956d920f30307b299b0a113 (patch) | |
| tree | 0051995ef6397a76d2da9f2bb0ffae4417d7a892 | |
| parent | 2e174533f031744bae697b2bfcf72882ad7d9c2f (diff) | |
| parent | 76d419137978846dd1fb5eb8bae35c26add3c938 (diff) | |
| download | mariadb-git-729f0158669cb4dc7956d920f30307b299b0a113.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
| -rw-r--r-- | storage/ndb/src/common/util/SocketClient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/ndb/src/common/util/SocketClient.cpp b/storage/ndb/src/common/util/SocketClient.cpp index ec35fd3eb90..c2825901929 100644 --- a/storage/ndb/src/common/util/SocketClient.cpp +++ b/storage/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); |