From: Jonas Oreland
Date: September 21 2011 8:55am
Subject: bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4539 to 4540)
 Bug#12543299
List-Archive: http://lists.mysql.com/commits/141087
X-Bug: 12543299
Message-Id: <20110921085542.6297B4C9D4@perch.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4540 Jonas Oreland	2011-09-21
      ndb - bug#12543299 - 1) change default values on Ndb_cluster_connection::connect 2) bump libndbclient.so major version, as we now honor arguments given

    modified:
      configure.in
      storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
 4539 Ole John Aske	2011-09-20
      Fixed Valgrind warnings caused by NdbReceiver::m_expected_result_length &
      ::m_received_result_length being uninitialized in some cases.
      
      Changed init of NdbRootFragment::m_remainingScans to 0xfff... in order to indicate that
      no results has been received yet - This will later force NdbRootFragment::prepareNextReceiveSet()
      to call NdbResultStream::prepareNextReceiveSet() for *all* ResultStreams such that
      its NdbReceiver::prepareReceive() is called, which will init these fields.
      
      Removed some incorrect asserts as ::prepareNextReceiveSet() *should* be
      called even for pure lookup queries. 

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'configure.in'
--- a/configure.in	2011-07-04 13:40:57 +0000
+++ b/configure.in	2011-09-21 08:53:48 +0000
@@ -35,7 +35,7 @@ DOT_FRM_VERSION=6
 # See the libtool docs for information on how to do shared lib versions.
 SHARED_LIB_MAJOR_VERSION=16
 SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
-NDB_SHARED_LIB_MAJOR_VERSION=4
+NDB_SHARED_LIB_MAJOR_VERSION=5
 NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?

=== modified file 'storage/ndb/include/ndbapi/ndb_cluster_connection.hpp'
--- a/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp	2011-09-09 10:48:14 +0000
+++ b/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp	2011-09-21 08:53:48 +0000
@@ -117,7 +117,7 @@ public:
    *         1 = recoverable error,
    *        -1 = non-recoverable error
    */
-  int connect(int no_retries=0, int retry_delay_in_seconds=1, int verbose=0);
+  int connect(int no_retries=30, int retry_delay_in_seconds=1, int verbose=0);
 
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
   int start_connect_thread(int (*connect_callback)(void)= 0);

No bundle (reason: useless for push emails).