1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

Browse Source 
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
This commit is contained in:
stewart@willster.(none) 2007-01-24 16:24:21 +11:00
commit b0d94e9d35
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ndb/src/common/util/SocketClient.cpp
View File

@ -109,7 +109,7 @@ SocketClient::connect(const char *toaddress, unsigned short toport)
struct timeval tval; struct timeval tval;
int r; int r;
bool use_timeout; bool use_timeout;
socklen_t len; SOCKOPT_OPTLEN_TYPE len;
int flags; int flags;
if (m_sockfd == NDB_INVALID_SOCKET) 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)) if (FD_ISSET(m_sockfd, &rset) || FD_ISSET(m_sockfd, &wset))
{ {
len= sizeof(r); 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 // Solaris got an error... different than others
NDB_CLOSE_SOCKET(m_sockfd); NDB_CLOSE_SOCKET(m_sockfd);