bk commit into 4.1 tree (mskold:1.2086) BUG#8753

[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.2086 05/03/07 10:53:16 mskold@stripped +2 -0
  Review fixes for Bug #8753 Invalid schema
  object version after dropping index

  sql/ha_ndbcluster.h
    1.49 05/03/07 10:53:03 mskold@stripped +1 -1
    Review fixes for Bug #8753 Invalid schema
    object version after dropping index

  sql/ha_ndbcluster.cc
    1.132 05/03/07 10:53:03 mskold@stripped +4 -5
    Review fixes for Bug #8753 Invalid schema
    object version after dropping index

# 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.131/sql/ha_ndbcluster.cc	Mon Mar  7 10:21:08 2005
+++ 1.132/sql/ha_ndbcluster.cc	Mon Mar  7 10:53:03 2005
@@ -328,7 +328,7 @@
     #   The mapped error code
 */
 
-void ha_ndbcluster::invalidateCache()
+void ha_ndbcluster::invalidateDictionaryCache()
 {
   NDBDICT *dict= get_ndb()->getDictionary();
   DBUG_PRINT("info", ("invalidating %s", m_tabname));
@@ -341,8 +341,7 @@
     NDBINDEX *unique_index = (NDBINDEX *) m_index[i].unique_index;
     NDB_INDEX_TYPE idx_type= m_index[i].type;
 
-    
-    switch(m_index[i].type) {
+    switch(idx_type) {
     case(PRIMARY_KEY_ORDERED_INDEX):
     case(ORDERED_INDEX):
       dict->invalidateIndex(index->getName(), m_tabname);
@@ -369,7 +368,7 @@
   switch (err.classification) {
   case NdbError::SchemaError:
   {
-    invalidateCache();
+    invalidateDictionaryCache();
     break;
   }
   default:
@@ -759,7 +758,7 @@
       if (!invalidating_ndb_table)
       {
 	DBUG_PRINT("info", ("Invalidating table"));
-        invalidateCache();
+        invalidateDictionaryCache();
 	invalidating_ndb_table= TRUE;
       }
       else

--- 1.48/sql/ha_ndbcluster.h	Mon Mar  7 10:21:08 2005
+++ 1.49/sql/ha_ndbcluster.h	Mon Mar  7 10:53:03 2005
@@ -201,7 +201,7 @@
   void print_results();
 
   longlong get_auto_increment();
-  void invalidateCache();
+  void invalidateDictionaryCache();
   int ndb_err(NdbConnection*);
   bool uses_blob_value(bool all_fields);