Merge perch.ndb.mysql.com:/home/jonas/src/51-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

@@ -119,10 +119,10 @@ operator<<(NdbOut& out, Dblqh::ScanRecord::ScanType state){
 const Uint32 NR_ScanNo = 0;
 
 #if defined VM_TRACE || defined ERROR_INSERT || defined NDBD_TRACENR
-static FileOutputStream tracenr_fos(fopen("tracenr.log", "w+"));
-NdbOut tracenrout(tracenr_fos);
+#include <NdbConfig.h>
+NdbOut * tracenrout = 0;
 static int TRACENR_FLAG = 0;
-#define TRACENR(x) tracenrout << x
+#define TRACENR(x) (* tracenrout) << x
 #define SET_TRACENR_FLAG TRACENR_FLAG = 1
 #define CLEAR_TRACENR_FLAG TRACENR_FLAG = 0
 #else
@@ -446,6 +446,12 @@ void Dblqh::execSTTOR(Signal* signal)
     c_acc = (Dbacc*)globalData.getBlock(DBACC);
     ndbrequire(c_tup != 0 && c_acc != 0);
     sendsttorryLab(signal);
+    
+#if defined VM_TRACE || defined ERROR_INSERT || defined NDBD_TRACENR
+    char *name = NdbConfig_SignalLogFileName(getOwnNodeId());
+    tracenrout = new NdbOut(* new FileOutputStream(fopen(name, "w+")));
+#endif
+    
     return;
     break;
   case 4:
@@ -6704,10 +6710,6 @@ void Dblqh::execACCKEYREF(Signal* signal)
      *
      * -> ZNO_TUPLE_FOUND is possible
      */
-    ndbrequire(tcPtr->operation == ZREAD 
-	       || tcPtr->operation == ZREAD_EX
-	       || tcPtr->seqNoReplica == 0);
-    
     ndbrequire
       (tcPtr->seqNoReplica == 0 ||
        errCode != ZTUPLE_ALREADY_EXIST ||

storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp

@@ -280,7 +280,7 @@ Dbtup::scanReply(Signal* signal, ScanOpPtr scanPtr)
       const ScanPos& pos = scan.m_scanPos;
       const Local_key& key_mm = pos.m_key_mm;
       int ret = tuxReadPk(fragPtr.i, pos.m_realpid_mm, key_mm.m_page_idx,
-			  pkData, false);
+			  pkData, true);
       ndbrequire(ret > 0);
       pkSize = ret;
       dbg((DBTUP, "PK size=%d data=%08x", pkSize, pkData[0]));