bzr push into mysql-5.1-telco-7.0 branch (jonas:4346 to 4348)

[Jonas Oreland]

 4348 Jonas Oreland	2011-04-29
      ndb - fix incorrect assertion (although harmless) in Dbspj. Update comments around it

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 4347 Jonas Oreland	2011-04-29
      ndb - fix a spj node-failure case, which broke with recent change to abort handling

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
 4346 Jonas Oreland	2011-04-28
      ndb - bug#11793592 - change error message for 1302-"Out of backup records" to "A backup is already running"

    modified:
      storage/ndb/src/ndbapi/ndberror.c
=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-03-29 06:50:49 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-04-29 09:11:12 +0000
@@ -1583,8 +1583,6 @@ Dbspj::nodeFail(Signal* signal, Ptr<Requ
 {
   Uint32 cnt = 0;
   Uint32 iter = 0;
-  Uint32 outstanding = requestPtr.p->m_outstanding;
-  Uint32 aborting = requestPtr.p->m_state & Request::RS_ABORTING;
 
   {
     Ptr<TreeNode> nodePtr;
@@ -1623,12 +1621,6 @@ Dbspj::nodeFail(Signal* signal, Ptr<Requ
   {
     jam();
     abort(signal, requestPtr, DbspjErr::NodeFailure);
-
-    if (aborting && outstanding && requestPtr.p->m_outstanding == 0)
-    {
-      jam();
-      checkBatchComplete(signal, requestPtr, 0);
-    }
   }
 
   return cnt + iter;
@@ -4731,20 +4723,16 @@ Dbspj::scanIndex_parent_row(Signal* sign
         break;
       }
 
-      if (fragPtr.p->m_ref == 0)
-      {
-        jam();
-        fragPtr.p->m_ref = tmp.receiverRef;
-      }
-      else
-      {
-        /**
-         * TODO: not 100% sure if this is correct with reorg ongoing...
-         *       but scanning "old" should regardless be safe as we still have
-         *       scanCookie
-         */
-        ndbassert(fragPtr.p->m_ref == tmp.receiverRef);
-      }
+      /**
+       * NOTE: We can get different receiverRef's here
+       *       for different keys. E.g during node-recovery where
+       *       primary-fragment is switched.
+       *
+       *       Use latest that we receive
+       *
+       * TODO: Also double check table-reorg
+       */
+      fragPtr.p->m_ref = tmp.receiverRef;
     }
     else
     {

No bundle (reason: useless for push emails).