Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

sql/ha_ndbcluster.cc

@@ -421,11 +421,15 @@ void ha_ndbcluster::no_uncommitted_rows_reset(THD *thd)
 void ha_ndbcluster::invalidate_dictionary_cache(bool global)
 {
   NDBDICT *dict= get_ndb()->getDictionary();
+  DBUG_ENTER("invalidate_dictionary_cache");
   DBUG_PRINT("info", ("invalidating %s", m_tabname));
+
   if (global)
   {
-    if (((const NDBTAB *)m_table)->getObjectStatus() 
-        == NdbDictionary::Object::Invalid)
+    const NDBTAB *tab= dict->getTable(m_tabname);
+    if (!tab)
+      DBUG_VOID_RETURN;
+    if (tab->getObjectStatus() == NdbDictionary::Object::Invalid)
     {
       // Global cache has already been invalidated
       dict->removeCachedTable(m_tabname);
@@ -468,6 +472,7 @@ void ha_ndbcluster::invalidate_dictionary_cache(bool global)
       break;
     }
   }
+  DBUG_VOID_RETURN;
 }
 
 int ha_ndbcluster::ndb_err(NdbTransaction *trans)
@@ -930,7 +935,6 @@ int ha_ndbcluster::get_metadata(const char *path)
       if (!invalidating_ndb_table)
       {
         DBUG_PRINT("info", ("Invalidating table"));
-        m_table= (void *) tab;
         invalidate_dictionary_cache(TRUE);
         invalidating_ndb_table= TRUE;
       }