Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

@@ -4959,6 +4959,7 @@ void Dbtc::execLQHKEYREF(Signal* signal)
 	}
       }
       
+      Uint32 marker = regTcPtr->commitAckMarker;
       markOperationAborted(regApiPtr, regTcPtr);
       
       if(regApiPtr->apiConnectstate == CS_ABORTING){
@@ -4978,7 +4979,7 @@ void Dbtc::execLQHKEYREF(Signal* signal)
 	return;
       }//if
 
-      if (regTcPtr->commitAckMarker != RNIL){
+      if (marker != RNIL){
 	/**
 	 * This was an insert/update/delete/write which failed
 	 *   that contained the marker

ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp

@@ -139,8 +139,9 @@ void Dbtup::initializePage()
   ptrAss(pagePtr, page);
   pagePtr.p->pageWord[ZPAGE_STATE_POS] = ~ZFREE_COMMON;
   
-  cnoOfAllocatedPages = 1 + MAX_PARALLELL_TUP_SRREQ;
-  returnCommonArea(cnoOfAllocatedPages, cnoOfPage - cnoOfAllocatedPages);
+  Uint32 tmp = 1 + MAX_PARALLELL_TUP_SRREQ;
+  returnCommonArea(tmp, cnoOfPage - tmp);
+  cnoOfAllocatedPages = tmp; // Is updated by returnCommonArea
   c_sr_free_page_0 = ~0;
 }//Dbtup::initializePage()