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

fix hpux build problem and some ndb connect errors being missed

Browse Source 
ndb/src/common/util/SocketClient.cpp:
  fix two problems recently introduced:
  - HPUX build problem
  - some connect errors not being detected properly
This commit is contained in:
unknown 2007-01-24 16:12:39 +11:00
parent 964f502cc2
commit 71f606804c
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;
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);