Commit 2b3165b7 authored by unknown's avatar unknown

Merge jonas@perch:src/mysql-4.1

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