From 87636012c7a84ad90d38ff7b28d68ebea67a5098 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Thu, 10 Mar 2005 10:46:19 +0100
Subject: [PATCH] Fix uninitialised variable in Dbacc

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Found use of uninitialised variable when increasing m_commit_count.
  Moved initialisation of rootfragrecptr to before increase of m_commit_count, and removed the two initializations further down, since they are now unneccessary.
---
 ndb/src/kernel/blocks/dbacc/DbaccMain.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index dd68599f4f6..a16c0da369b 100644
--- a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
@@ -2449,14 +2449,14 @@ void Dbacc::execACC_COMMITREQ(Signal* signal)
   operationRecPtr.p->transactionstate = IDLE;
   operationRecPtr.p->operation = ZUNDEFINED_OP;
   if(Toperation != ZREAD){
+    rootfragrecptr.i = fragrecptr.p->myroot;
+    ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);
     rootfragrecptr.p->m_commit_count++;
     if (Toperation != ZINSERT) {
       if (Toperation != ZDELETE) {
 	return;
       } else {
 	jam();
-	rootfragrecptr.i = fragrecptr.p->myroot;
-	ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);
 	rootfragrecptr.p->noOfElements--;
 	fragrecptr.p->slack += operationRecPtr.p->insertDeleteLen;
 	if (fragrecptr.p->slack > fragrecptr.p->slackCheck) { 
@@ -2476,8 +2476,6 @@ void Dbacc::execACC_COMMITREQ(Signal* signal)
       }//if
     } else {
       jam();  /* EXPAND PROCESS HANDLING */
-      rootfragrecptr.i = fragrecptr.p->myroot;
-      ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);
       rootfragrecptr.p->noOfElements++;
       fragrecptr.p->slack -= operationRecPtr.p->insertDeleteLen;
       if (fragrecptr.p->slack >= (1u << 31)) {