bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:4927 to 4928) Bug#14107173

[magnus.blaudd]

 4928 magnus.blaudd@stripped	2012-05-23
      Bug#14107173 CONNECT WITH TIMEOUT DOES NOT SET SOCKET BACK TO BLOCKING
       - Set socket back to blocking mode after connect finish

    modified:
      storage/ndb/src/common/util/SocketClient.cpp
 4927 Frazer Clement	2012-05-21
      Bug #14075825 LCP Watchdog : Fragment scan check
      
      The Local Checkpoint (LCP) mechanism allows Ndb to trim its redo and
      undo logs.  This keeps node and system recovery time within bounds, 
      and maintains free redo and undo space to support logging DML 
      operations. 
       
      A watchdog mechanism is added to supervise fragment scans occurring
      as part of a local checkpoint.  This is intended to guard against any
      scan related OS level IO errors or bugs causing issues with LCP and 
      endangering write service and recovery times.
      
      Each node independently monitors the progress of local fragment 
      scans occurring as part of an LCP.  If no progress is made for 
      20 seconds, warning logs will be generated every 10 seconds.  
      If no progress is made for one minute then the fragment scan is 
      considered to be hung, and the node will be restarted to enable 
      LCP to continue. 
      
      Any occurrence of warning logs or other action taken by this 
      watchdog should be reported as a bug.
      
      A new test scenario is added to testNodeRestart. 

    modified:
      storage/ndb/include/kernel/GlobalSignalNumbers.h
      storage/ndb/include/kernel/signaldata/LCP.hpp
      storage/ndb/include/kernel/signaldata/SignalData.hpp
      storage/ndb/src/common/debugger/signaldata/LCP.cpp
      storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.hpp
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/test/include/NdbMgmd.hpp
      storage/ndb/test/ndbapi/testNodeRestart.cpp
      storage/ndb/test/run-test/daily-devel-tests.txt
=== modified file 'storage/ndb/src/common/util/SocketClient.cpp'
--- a/storage/ndb/src/common/util/SocketClient.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/common/util/SocketClient.cpp	2012-05-23 11:45:13 +0000
@@ -189,7 +189,7 @@ SocketClient::connect(const char *toaddr
   }
 
 done:
-  if (my_socket_nonblock(m_sockfd, true) < 0)
+  if (my_socket_nonblock(m_sockfd, false) < 0)
   {
     my_socket_close(m_sockfd);
     my_socket_invalidate(&m_sockfd);

No bundle (reason: useless for push emails).