Commit cf714573 authored by tomas@poseidon.ndb.mysql.com's avatar tomas@poseidon.ndb.mysql.com

Merge jonas@perch:src/mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
parents 71d5a20d aea2a9c7
...@@ -278,12 +278,15 @@ GlobalDictCache::invalidate_all() ...@@ -278,12 +278,15 @@ GlobalDictCache::invalidate_all()
if (vers->size()) if (vers->size())
{ {
TableVersion * ver = & vers->back(); TableVersion * ver = & vers->back();
ver->m_impl->m_status = NdbDictionary::Object::Invalid; if (ver->m_status != RETREIVING)
ver->m_status = DROPPED;
if (ver->m_refCount == 0)
{ {
delete ver->m_impl; ver->m_impl->m_status = NdbDictionary::Object::Invalid;
vers->erase(vers->size() - 1); ver->m_status = DROPPED;
if (ver->m_refCount == 0)
{
delete ver->m_impl;
vers->erase(vers->size() - 1);
}
} }
} }
curr = m_tableHash.getNext(curr); curr = m_tableHash.getNext(curr);
......
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