bk commit into 5.1 tree (tomas:1.2657) BUG#30366

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas.  When tomas does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-01-24 12:06:40+01:00, tomas@stripped +1 -0
  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

  storage/ndb/src/common/util/OutputStream.cpp@stripped, 2008-01-24 12:06:37+01:00, tomas@stripped +2 -2
    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

diff -Nrup a/storage/ndb/src/common/util/OutputStream.cpp b/storage/ndb/src/common/util/OutputStream.cpp
--- a/storage/ndb/src/common/util/OutputStream.cpp	2007-03-07 10:14:28 +01:00
+++ b/storage/ndb/src/common/util/OutputStream.cpp	2008-01-24 12:06:37 +01:00
@@ -62,7 +62,7 @@ SocketOutputStream::print(const char * f
 
   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 *
 
   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;