diff options
author | msvensson@neptunus.(none) <> | 2005-03-10 10:46:19 +0100 |
---|---|---|
committer | msvensson@neptunus.(none) <> | 2005-03-10 10:46:19 +0100 |
commit | 19cc40262425f80aa6434b9f60056961d6530ac0 (patch) | |
tree | e0181de97d2149ad200aac694f22a4e5b3fec752 /ndb/src/kernel/blocks/dbacc/DbaccMain.cpp | |
parent | c94952d1f0744011f0c225a42cd97f025e56d75b (diff) | |
download | mariadb-git-19cc40262425f80aa6434b9f60056961d6530ac0.tar.gz |
Fix uninitialised variable in Dbacc
Diffstat (limited to 'ndb/src/kernel/blocks/dbacc/DbaccMain.cpp')
-rw-r--r-- | ndb/src/kernel/blocks/dbacc/DbaccMain.cpp | 6 |
1 files 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)) { |