Commit f63f994b authored by joreland@mysql.com's avatar joreland@mysql.com

bug#at - testNdbApi WaitUntilReady, MaxNdb

fix delete of dictionary before connection has been established
parent e9edf3cf
...@@ -596,6 +596,7 @@ static int f_dictionary_count = 0; ...@@ -596,6 +596,7 @@ static int f_dictionary_count = 0;
NdbDictionaryImpl::~NdbDictionaryImpl() NdbDictionaryImpl::~NdbDictionaryImpl()
{ {
NdbElement_t<NdbTableImpl> * curr = m_localHash.m_tableHash.getNext(0); NdbElement_t<NdbTableImpl> * curr = m_localHash.m_tableHash.getNext(0);
if(m_globalHash){
while(curr != 0){ while(curr != 0){
m_globalHash->lock(); m_globalHash->lock();
m_globalHash->release(curr->theData); m_globalHash->release(curr->theData);
...@@ -614,8 +615,13 @@ NdbDictionaryImpl::~NdbDictionaryImpl() ...@@ -614,8 +615,13 @@ NdbDictionaryImpl::~NdbDictionaryImpl()
NdbDictionary::Column::COMMIT_COUNT= 0; NdbDictionary::Column::COMMIT_COUNT= 0;
} }
m_globalHash->unlock(); m_globalHash->unlock();
} else {
assert(curr == 0);
}
} }
#if 0 #if 0
bool bool
NdbDictionaryImpl::setTransporter(class TransporterFacade * tf) NdbDictionaryImpl::setTransporter(class TransporterFacade * tf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment