mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Merge
ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged ndb/src/ndbapi/NdbReceiver.cpp: Auto merged ndb/src/ndbapi/TransporterFacade.cpp: Auto merged ndb/src/ndbapi/TransporterFacade.hpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: SCCS merged
This commit is contained in:
@@ -660,6 +660,7 @@ NdbDictionaryImpl::getIndexTable(NdbIndexImpl * index,
|
||||
return getTable(m_ndb.externalizeTableName(internalName));
|
||||
}
|
||||
|
||||
#if 0
|
||||
bool
|
||||
NdbDictInterface::setTransporter(class TransporterFacade * tf)
|
||||
{
|
||||
@@ -683,11 +684,11 @@ NdbDictInterface::setTransporter(class TransporterFacade * tf)
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool
|
||||
NdbDictInterface::setTransporter(class Ndb* ndb, class TransporterFacade * tf)
|
||||
{
|
||||
m_blockNumber = -1;
|
||||
m_reference = ndb->getReference();
|
||||
m_transporter = tf;
|
||||
m_waiter.m_mutex = tf->theMutexPtr;
|
||||
@@ -697,10 +698,6 @@ NdbDictInterface::setTransporter(class Ndb* ndb, class TransporterFacade * tf)
|
||||
|
||||
NdbDictInterface::~NdbDictInterface()
|
||||
{
|
||||
if (m_transporter != NULL){
|
||||
if (m_blockNumber != -1)
|
||||
m_transporter->close(m_blockNumber, 0);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
@@ -787,7 +784,7 @@ NdbDictInterface::execSignal(void* dictImpl,
|
||||
}
|
||||
|
||||
void
|
||||
NdbDictInterface::execNodeStatus(void* dictImpl, NodeId aNode,
|
||||
NdbDictInterface::execNodeStatus(void* dictImpl, Uint32 aNode,
|
||||
bool alive, bool nfCompleted)
|
||||
{
|
||||
NdbDictInterface * tmp = (NdbDictInterface*)dictImpl;
|
||||
|
Reference in New Issue
Block a user