bk commit into 5.1 tree (jonas:1.2700)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-03 07:23:47+01:00, jonas@stripped +1 -0
  ndb - xmas
    fix testNodeRestart -n Bug27003 T1

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-12-03 07:23:44+01:00,
jonas@stripped +1 -1
    ndb - xmas
      fix testNodeRestart -n Bug27003 T1

diff -Nrup a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-11-30 15:40:01 +01:00
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2007-12-03 07:23:44 +01:00
@@ -3884,7 +3884,7 @@ void Dbdih::execCOPY_FRAGREF(Signal* sig
   Uint32 errorCode = ref->errorCode;
 
   TakeOverRecordPtr takeOverPtr;
-  ndbrequire(errorCode != ZNODE_FAILURE_ERROR);
+  c_takeOverPool.getPtr(takeOverPtr, takeOverPtrI);  
   ndbrequire(ref->tableId == takeOverPtr.p->toCurrentTabref);
   ndbrequire(ref->fragId == takeOverPtr.p->toCurrentFragid);
   ndbrequire(ref->startingNodeId == takeOverPtr.p->toStartingNode);