Commit 4d6c4dbe authored by unknown's avatar unknown
Browse files

ndb - post merge fixes... 


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  merge
parent 05ba11bf

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

storage/ndb/src/ndbapi/NdbTransaction.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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));