bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4900 to 4901) Bug#13825163

[Jonas Oreland]

 4901 Jonas Oreland	2012-03-21
      ndb - bug#13825163 - decrease timeouts on transporter handshake to prevent live-locking

    modified:
      storage/ndb/include/util/InputStream.hpp
      storage/ndb/src/common/transporter/Transporter.cpp
 4900 Jonas Oreland	2012-03-21
      ndb - increase MaxNoOfAttributes which increased when adding columns to T6

    modified:
      storage/ndb/test/run-test/conf-blade08.cnf
      storage/ndb/test/run-test/conf-ndb07.cnf
      storage/ndb/test/run-test/conf-tyr13.cnf
=== modified file 'storage/ndb/include/util/InputStream.hpp'
--- a/storage/ndb/include/util/InputStream.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/include/util/InputStream.hpp	2012-03-21 15:31:06 +0000
@@ -57,7 +57,7 @@ class SocketInputStream : public InputSt
   bool m_startover;
   bool m_timedout;
 public:
-  SocketInputStream(NDB_SOCKET_TYPE socket, unsigned read_timeout_ms = 60000);
+  SocketInputStream(NDB_SOCKET_TYPE socket, unsigned read_timeout_ms = 3000);
   virtual ~SocketInputStream() {}
   char* gets(char * buf, int bufLen);
   bool timedout() { return m_timedout; }

=== modified file 'storage/ndb/src/common/transporter/Transporter.cpp'
--- a/storage/ndb/src/common/transporter/Transporter.cpp	2011-12-09 19:12:56 +0000
+++ b/storage/ndb/src/common/transporter/Transporter.cpp	2012-03-21 15:31:06 +0000
@@ -74,7 +74,7 @@ Transporter::Transporter(TransporterRegi
   checksumUsed    = _checksum;
   signalIdUsed    = _signalId;
 
-  m_timeOutMillis = 30000;
+  m_timeOutMillis = 3000;
 
   m_connect_address.s_addr= 0;
   if(s_port<0)

No bundle (reason: useless for push emails).