mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor bugs

Browse source
This commit is contained in:
joreland@mysql.com 2004-08-15 20:44:41 +02:00
parent e51de97ebe
commit f8778b2c56
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
View file

@ -139,6 +139,12 @@ void Dbtup::initializePage()
pagePtr.i = 0;
ptrAss(pagePtr, page);
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;
returnCommonArea(tmp, cnoOfPage - tmp);

2
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
View file

@ -1613,6 +1613,7 @@ void Ndbcntr::startInsertTransactions(Signal* signal)
ckey = 1;
ctransidPhase = ZTRUE;
signal->theData[0] = 0;
signal->theData[1] = reference();
sendSignal(DBTC_REF, GSN_TCSEIZEREQ, signal, 2, JBB);
return;
@ -1740,6 +1741,7 @@ void Ndbcntr::crSystab8Lab(Signal* signal)
}//if
signal->theData[0] = ctcConnectionP;
signal->theData[1] = reference();
signal->theData[2] = 0;
sendSignal(DBTC_REF, GSN_TCRELEASEREQ, signal, 2, JBB);
return;
}//Ndbcntr::crSystab8Lab()

11
ndb/test/src/NDBT_Tables.cpp
View file

@ -806,8 +806,9 @@ NDBT_Tables::createAllTables(Ndb* pNdb, bool _temp, bool existsOk){
pNdb->getDictionary()->dropTable(NDBT_Tables::getTable(i)->getName());
int ret= createTable(pNdb,
NDBT_Tables::getTable(i)->getName(), _temp, existsOk);
if(ret)
if(ret){
return ret;
}
}
return NDBT_OK;
}
@ -836,15 +837,17 @@ NDBT_Tables::createTable(Ndb* pNdb, const char* _name, bool _temp,
r = pNdb->getDictionary()->createTable(tmpTab);
if(r == -1){
if(!existsOk)
if(!existsOk){
ndbout << "Error: " << pNdb->getDictionary()->getNdbError() << endl;
break;
}
if(pNdb->getDictionary()->getNdbError().code != 721){
ndbout << pNdb->getDictionary()->getNdbError() << endl;
ndbout << "Error: " << pNdb->getDictionary()->getNdbError() << endl;
break;
}
r = 0;
}
Uint32 i = 0;
for(Uint32 i = 0; indexes[i].m_table != 0; i++){
if(strcmp(indexes[i].m_table, _name) != 0)