bk commit into 4.1 tree (mskold:1.2213)

[Martin Skold]

Below is the list of changes that have just been committed into a local
4.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2213 05/04/28 10:46:39 mskold@stripped +1 -0
  Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes

  sql/ha_ndbcluster.cc
    1.150 05/04/28 10:46:09 mskold@stripped +7 -3
    Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-4.1

--- 1.149/sql/ha_ndbcluster.cc	Thu Apr 28 09:38:54 2005
+++ 1.150/sql/ha_ndbcluster.cc	Thu Apr 28 10:46:09 2005
@@ -334,11 +334,15 @@
 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);
@@ -381,6 +385,7 @@
       break;
     }
   }
+  DBUG_VOID_RETURN;
 }
 
 int ha_ndbcluster::ndb_err(NdbConnection *trans)
@@ -815,7 +820,6 @@
       if (!invalidating_ndb_table)
       {
 	DBUG_PRINT("info", ("Invalidating table"));
-        m_table= (void *) tab;
         invalidate_dictionary_cache(TRUE);
 	invalidating_ndb_table= TRUE;
       }