Commit 24e61819 authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

Bug#30366 (recommit) NDB fails to start on OS X, PPC, 64 bit 

- The errno variable should only be used when the previous socket
  write failed, it should be regarded as undefined at other times
parent 362499ea

storage/ndb/src/common/util/OutputStream.cpp

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ SocketOutputStream::print(const char * fmt, ...){ 


  if(ret >= 0)

    m_timeout_remain-=time;

  if(errno==ETIMEDOUT || m_timeout_remain<=0)

  if((ret < 0 && errno==ETIMEDOUT) || m_timeout_remain<=0)

  {

    m_timedout= true;

    ret= -1;
@@ -84,7 +84,7 @@ SocketOutputStream::println(const char * fmt, ...){ 


  if(ret >= 0)

    m_timeout_remain-=time;

  if (errno==ETIMEDOUT || m_timeout_remain<=0)

  if ((ret < 0 && errno==ETIMEDOUT) || m_timeout_remain<=0)

  {

    m_timedout= true;

    ret= -1;