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

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
parents f413bc2f ec8771af
...@@ -325,6 +325,8 @@ GlobalDictCache::invalidate_all() ...@@ -325,6 +325,8 @@ GlobalDictCache::invalidate_all()
if (vers->size()) if (vers->size())
{ {
TableVersion * ver = & vers->back(); TableVersion * ver = & vers->back();
if (ver->m_status != RETREIVING)
{
ver->m_impl->m_status = NdbDictionary::Object::Invalid; ver->m_impl->m_status = NdbDictionary::Object::Invalid;
ver->m_status = DROPPED; ver->m_status = DROPPED;
if (ver->m_refCount == 0) if (ver->m_refCount == 0)
...@@ -333,6 +335,7 @@ GlobalDictCache::invalidate_all() ...@@ -333,6 +335,7 @@ GlobalDictCache::invalidate_all()
vers->erase(vers->size() - 1); vers->erase(vers->size() - 1);
} }
} }
}
curr = m_tableHash.getNext(curr); curr = m_tableHash.getNext(curr);
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
......
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