bzr push into mysql-5.1-telco-7.1 branch (jonas:3939 to 3940)

[Jonas Oreland]

 3940 Jonas Oreland	2010-11-03 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
 3939 Jonas Oreland	2010-11-02 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/include/kernel/signaldata/ScanFrag.hpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.hpp
      storage/ndb/test/ndbapi/testBackup.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2010-08-11 12:11:47 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2010-11-03 08:34:16 +0000
@@ -3236,6 +3236,16 @@ void Qmgr::execAPI_REGREQ(Signal* signal
   NodeRecPtr apiNodePtr;
   apiNodePtr.i = refToNode(ref);
   ptrCheckGuard(apiNodePtr, MAX_NODES, nodeRec);
+
+  if (apiNodePtr.p->phase == ZFAIL_CLOSING)
+  {
+    jam();
+    /**
+     * This node is pending CLOSE_COM_CONF
+     *   ignore API_REGREQ
+     */
+    return;
+  }
   
 #if 0
   ndbout_c("Qmgr::execAPI_REGREQ: Recd API_REGREQ (NodeId=%d)", apiNodePtr.i);

No bundle (reason: useless for push emails).