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

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

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

OutputStream.cpp:
  Only use "errno" after the attempt to write to the socket has failed


storage/ndb/src/common/util/OutputStream.cpp:
  Only use "errno" after the attempt to write to the socket has failed
This commit is contained in:
unknown 2008-01-15 15:01:21 +01:00
parent d1c46eedad
commit 16159170b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/ndb/src/common/util/OutputStream.cpp
View File

@ -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;