Commit d9e3b38f authored by unknown's avatar unknown

Minor bugs


ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Init page state
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Init usr pointer for tcseize/releasereq
ndb/test/src/NDBT_Tables.cpp:
  More error printouts
parent 20160a10
...@@ -140,6 +140,12 @@ void Dbtup::initializePage() ...@@ -140,6 +140,12 @@ void Dbtup::initializePage()
ptrAss(pagePtr, page); ptrAss(pagePtr, page);
pagePtr.p->pageWord[ZPAGE_STATE_POS] = ~ZFREE_COMMON; pagePtr.p->pageWord[ZPAGE_STATE_POS] = ~ZFREE_COMMON;
for(size_t j = 0; j<MAX_PARALLELL_TUP_SRREQ; j++){
pagePtr.i = 1+j;
ptrAss(pagePtr, page);
pagePtr.p->pageWord[ZPAGE_STATE_POS] = ~ZFREE_COMMON;
}
Uint32 tmp = 1 + MAX_PARALLELL_TUP_SRREQ; Uint32 tmp = 1 + MAX_PARALLELL_TUP_SRREQ;
returnCommonArea(tmp, cnoOfPage - tmp); returnCommonArea(tmp, cnoOfPage - tmp);
cnoOfAllocatedPages = tmp; // Is updated by returnCommonArea cnoOfAllocatedPages = tmp; // Is updated by returnCommonArea
......
...@@ -1613,6 +1613,7 @@ void Ndbcntr::startInsertTransactions(Signal* signal) ...@@ -1613,6 +1613,7 @@ void Ndbcntr::startInsertTransactions(Signal* signal)
ckey = 1; ckey = 1;
ctransidPhase = ZTRUE; ctransidPhase = ZTRUE;
signal->theData[0] = 0;
signal->theData[1] = reference(); signal->theData[1] = reference();
sendSignal(DBTC_REF, GSN_TCSEIZEREQ, signal, 2, JBB); sendSignal(DBTC_REF, GSN_TCSEIZEREQ, signal, 2, JBB);
return; return;
...@@ -1740,6 +1741,7 @@ void Ndbcntr::crSystab8Lab(Signal* signal) ...@@ -1740,6 +1741,7 @@ void Ndbcntr::crSystab8Lab(Signal* signal)
}//if }//if
signal->theData[0] = ctcConnectionP; signal->theData[0] = ctcConnectionP;
signal->theData[1] = reference(); signal->theData[1] = reference();
signal->theData[2] = 0;
sendSignal(DBTC_REF, GSN_TCRELEASEREQ, signal, 2, JBB); sendSignal(DBTC_REF, GSN_TCRELEASEREQ, signal, 2, JBB);
return; return;
}//Ndbcntr::crSystab8Lab() }//Ndbcntr::crSystab8Lab()
......
...@@ -806,9 +806,10 @@ NDBT_Tables::createAllTables(Ndb* pNdb, bool _temp, bool existsOk){ ...@@ -806,9 +806,10 @@ NDBT_Tables::createAllTables(Ndb* pNdb, bool _temp, bool existsOk){
pNdb->getDictionary()->dropTable(NDBT_Tables::getTable(i)->getName()); pNdb->getDictionary()->dropTable(NDBT_Tables::getTable(i)->getName());
int ret= createTable(pNdb, int ret= createTable(pNdb,
NDBT_Tables::getTable(i)->getName(), _temp, existsOk); NDBT_Tables::getTable(i)->getName(), _temp, existsOk);
if(ret) if(ret){
return ret; return ret;
} }
}
return NDBT_OK; return NDBT_OK;
} }
...@@ -836,10 +837,12 @@ NDBT_Tables::createTable(Ndb* pNdb, const char* _name, bool _temp, ...@@ -836,10 +837,12 @@ NDBT_Tables::createTable(Ndb* pNdb, const char* _name, bool _temp,
r = pNdb->getDictionary()->createTable(tmpTab); r = pNdb->getDictionary()->createTable(tmpTab);
if(r == -1){ if(r == -1){
if(!existsOk) if(!existsOk){
ndbout << "Error: " << pNdb->getDictionary()->getNdbError() << endl;
break; break;
}
if(pNdb->getDictionary()->getNdbError().code != 721){ if(pNdb->getDictionary()->getNdbError().code != 721){
ndbout << pNdb->getDictionary()->getNdbError() << endl; ndbout << "Error: " << pNdb->getDictionary()->getNdbError() << endl;
break; break;
} }
r = 0; r = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment