Merge jonas@perch:src/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main

Merge jonas@perch:src/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
337310a9 · unknown · 16556f61 · 05dad2de · 337310a9
Commit 337310a9 authored Jul 06, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

ndb/src/ndbapi/DictCache.cpp ndb/src/ndbapi/DictCache.cpp +8 -5

No files found.
--- a/ndb/src/ndbapi/DictCache.cpp
+++ b/ndb/src/ndbapi/DictCache.cpp
@@ -278,12 +278,15 @@ GlobalDictCache::invalidate_all()
    if (vers->size())
    {
      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);