From: Ole John Aske
Date: March 30 2011 7:02am
Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3457 to 3458)
List-Archive: http://lists.mysql.com/commits/134206
Message-Id: <20110330070249.C86E3218@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3458 Ole John Aske	2011-03-30
      SPJ: Fixed error handling in ::closeTcCursor() while waiting for a cursor to be (forcefully) closed
      
      If there was a node failure while waiting for close to be confirmed, we would call
      setFetchTerminated() twice - which is an error and would cause an assert to fire.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 3457 jonas oreland	2011-03-29 [merge]
      ndb - merge 70 to 70-spj

    modified:
      sql/ha_ndbcluster.cc
      storage/ndb/include/kernel/ndb_limits.h
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
      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/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/ndbapi/ObjectMap.cpp
      storage/ndb/src/ndbapi/ObjectMap.hpp
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-02-24 14:16:51 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-03-30 07:02:22 +0000
@@ -2955,7 +2955,7 @@ NdbQueryImpl::closeTcCursor(bool forceSe
 
       if (unlikely(impl->getNodeSequence(nodeId) != seq))
         setFetchTerminated(Err_NodeFailCausedAbort,false);
-      if (unlikely(result != FetchResult_ok))
+      else if (unlikely(result != FetchResult_ok))
       {
         if (result == FetchResult_timeOut)
           setFetchTerminated(Err_ReceiveTimedOut,false);

No bundle (reason: useless for push emails).