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.
This commit is contained in:
parent
8c2067654b
commit
87636012c7
@ -2449,14 +2449,14 @@ void Dbacc::execACC_COMMITREQ(Signal* signal)
|
|||||||
operationRecPtr.p->transactionstate = IDLE;
|
operationRecPtr.p->transactionstate = IDLE;
|
||||||
operationRecPtr.p->operation = ZUNDEFINED_OP;
|
operationRecPtr.p->operation = ZUNDEFINED_OP;
|
||||||
if(Toperation != ZREAD){
|
if(Toperation != ZREAD){
|
||||||
|
rootfragrecptr.i = fragrecptr.p->myroot;
|
||||||
|
ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);
|
||||||
rootfragrecptr.p->m_commit_count++;
|
rootfragrecptr.p->m_commit_count++;
|
||||||
if (Toperation != ZINSERT) {
|
if (Toperation != ZINSERT) {
|
||||||
if (Toperation != ZDELETE) {
|
if (Toperation != ZDELETE) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
jam();
|
jam();
|
||||||
rootfragrecptr.i = fragrecptr.p->myroot;
|
|
||||||
ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);
|
|
||||||
rootfragrecptr.p->noOfElements--;
|
rootfragrecptr.p->noOfElements--;
|
||||||
fragrecptr.p->slack += operationRecPtr.p->insertDeleteLen;
|
fragrecptr.p->slack += operationRecPtr.p->insertDeleteLen;
|
||||||
if (fragrecptr.p->slack > fragrecptr.p->slackCheck) {
|
if (fragrecptr.p->slack > fragrecptr.p->slackCheck) {
|
||||||
@ -2476,8 +2476,6 @@ void Dbacc::execACC_COMMITREQ(Signal* signal)
|
|||||||
}//if
|
}//if
|
||||||
} else {
|
} else {
|
||||||
jam(); /* EXPAND PROCESS HANDLING */
|
jam(); /* EXPAND PROCESS HANDLING */
|
||||||
rootfragrecptr.i = fragrecptr.p->myroot;
|
|
||||||
ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);
|
|
||||||
rootfragrecptr.p->noOfElements++;
|
rootfragrecptr.p->noOfElements++;
|
||||||
fragrecptr.p->slack -= operationRecPtr.p->insertDeleteLen;
|
fragrecptr.p->slack -= operationRecPtr.p->insertDeleteLen;
|
||||||
if (fragrecptr.p->slack >= (1u << 31)) {
|
if (fragrecptr.p->slack >= (1u << 31)) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user