diff --git a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp index d0267ad655d4b81be26ba6af3a89974df67beb97..042a2817892998ae5d94b2a253464572914d2f07 100644 --- a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp +++ b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp @@ -6400,9 +6400,6 @@ void Dbacc::execEXPANDCHECK2(Signal* signal) }//if }//if - ndbout_c("Expanding tab: %d frag: %d", - fragrecptr.p->myTableId, fragrecptr.p->myfid); - /*--------------------------------------------------------------------------*/ /* WE START BY FINDING THE PAGE, THE PAGE INDEX AND THE PAGE DIRECTORY*/ /* OF THE NEW BUCKET WHICH SHALL RECEIVE THE ELEMENT WHICH HAVE A 1 IN*/ @@ -6535,7 +6532,7 @@ void Dbacc::reenable_expand_after_redo_log_exection_complete(Signal* signal){ /** * Hmm... this means that it's alreay has been reenabled... */ - //ndbassert(false); + ndbassert(false); continue; case 1: /** @@ -7036,9 +7033,6 @@ void Dbacc::execSHRINKCHECK2(Signal* signal) fragrecptr.p->p--; }//if - ndbout_c("Shrinking tab: %d frag: %d", - fragrecptr.p->myTableId, fragrecptr.p->myfid); - /*--------------------------------------------------------------------------*/ /* WE START BY FINDING THE NECESSARY INFORMATION OF THE BUCKET TO BE */ /* REMOVED WHICH WILL SEND ITS ELEMENTS TO THE RECEIVING BUCKET. */ @@ -7236,7 +7230,7 @@ void Dbacc::endofshrinkbucketLab(Signal* signal) signal->theData[2] = fragrecptr.p->maxp; signal->theData[3] = fragrecptr.p->expandFlag; fragrecptr.p->expandFlag = 2; - sendSignal(cownBlockref, GSN_SHRINKCHECK2, signal, 3, JBB); + sendSignal(cownBlockref, GSN_SHRINKCHECK2, signal, 4, JBB); }//if }//if }//if diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp index c797149568fcd479b544a30387da84bd26cb6dcd..3d7f3258686cb36201656d88aa90662598fa6783 100644 --- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp @@ -15278,14 +15278,11 @@ void Dblqh::srFourthComp(Signal* signal) if(cstartType == NodeState::ST_SYSTEM_RESTART){ fragptr.i = c_redo_log_complete_frags; - ndbout_c("All fragment complete - "); while(fragptr.i != RNIL){ ptrCheckGuard(fragptr, cfragrecFileSize, fragrecord); signal->theData[0] = fragptr.p->tabRef; signal->theData[1] = fragptr.p->fragId; sendSignal(DBACC_REF, GSN_EXPANDCHECK2, signal, 2, JBB); - ndbout_c("table: %d fragment: %d", - fragptr.p->tabRef, fragptr.p->fragId); fragptr.i = fragptr.p->nextFrag; } }