From 6b8e4c93d98be005169f5fcefbb325ef7453086e Mon Sep 17 00:00:00 2001
From: "joreland@mysql.com" <>
Date: Fri, 6 Aug 2004 11:29:56 +0200
Subject: [PATCH] Bug#4586 + TC fix

---
 ndb/src/kernel/blocks/dbtc/DbtcMain.cpp     | 3 ++-
 ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index d395e75a3f0..ed467db1c6c 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/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
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp b/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
index cccbcfbe966..d168a6797bb 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
+++ b/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()