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

ndb - post merge fixes...

Browse source
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-09-26 14:08:20 +02:00
parent e609add790
commit ea12fac469
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file

@ -2877,7 +2877,7 @@ void Dbdict::checkSchemaStatus(Signal* signal)
// On NR get index from master because index state is not on file
Uint32 type= oldEntry->m_tableType;
const bool file = (* newEntry == * oldEntry) &&
(c_systemRestart || !DictTabInfo::isIndex(type);
(c_systemRestart || !DictTabInfo::isIndex(type));
newEntry->m_info_words= oldEntry->m_info_words;
restartCreateTab(signal, tableId, oldEntry, newEntry, file);
return;

2
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file

@ -18344,7 +18344,7 @@ Dblqh::execDUMP_STATE_ORD(Signal* signal)
FragrecordPtr fragPtr;
if ((fragPtr.i = tabPtr.p->fragrec[j]) != RNIL)
{
ptrCheckGuard(fragPtr, cfragrecFileSize, fragrecord);
c_fragment_pool.getPtr(fragPtr);
infoEvent(" frag: %d distKey: %u",
tabPtr.p->fragid[j],
fragPtr.p->fragDistributionKey);

2
storage/ndb/src/ndbapi/NdbTransaction.cpp
View file

@ -977,7 +977,7 @@ void releaseScanOperation();
Remark: Release scan op when hupp'ed trans closed (save memory)
******************************************************************************/
void
NdbTransaction::releaseScanOperation(NdbIndexScanOperation* cursorOp)
NdbTransaction::releaseExecutedScanOperation(NdbIndexScanOperation* cursorOp)
{
DBUG_ENTER("NdbTransaction::releaseExecutedScanOperation");
DBUG_PRINT("enter", ("this=0x%x op=0x%x", (UintPtr)this, (UintPtr)cursorOp));