diff options
| author | unknown <tomas@poseidon.(none)> | 2004-09-01 14:56:53 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-09-01 14:56:53 +0000 |
| commit | a0475132996a55e082b758ba11f86aa789d9d437 (patch) | |
| tree | a898799030e3f3a5580dbc4561c3771f53d258ae /ndb/src/ndbapi/NdbDictionaryImpl.cpp | |
| parent | 9ed92fea50cd8e6688a4370905050dc3cadfb771 (diff) | |
| download | mariadb-git-a0475132996a55e082b758ba11f86aa789d9d437.tar.gz | |
added class Ndb_cluster_connection to prepare for making order of starting mysqld and ndbd irrelevant
ndb/src/mgmsrv/Makefile.am:
changed so that datadir is "." by default so that behaviour is the same as before
Diffstat (limited to 'ndb/src/ndbapi/NdbDictionaryImpl.cpp')
| -rw-r--r-- | ndb/src/ndbapi/NdbDictionaryImpl.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp index a4d66a6c6d2..f63b6039eb8 100644 --- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -605,6 +605,7 @@ NdbDictionaryImpl::~NdbDictionaryImpl() } } +#if 0 void initDict(NdbDictionary::Dictionary & d) { @@ -624,6 +625,7 @@ NdbDictionaryImpl::setTransporter(class TransporterFacade * tf) return false; } +#endif bool NdbDictionaryImpl::setTransporter(class Ndb* ndb, @@ -643,6 +645,7 @@ NdbDictionaryImpl::getIndexTable(NdbIndexImpl * index, return getTable(m_ndb.externalizeTableName(internalName)); } +#if 0 bool NdbDictInterface::setTransporter(class TransporterFacade * tf) { @@ -666,11 +669,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; @@ -680,10 +683,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 @@ -770,7 +769,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; |