From e23e81f7dfa79b45d73dabcab35fef1b9317cc2d Mon Sep 17 00:00:00 2001
From: unknown <mskold@mysql.com>
Date: Mon, 7 Mar 2005 10:53:16 +0100
Subject: [PATCH] Review fixes for Bug #8753 Invalid schema object version
 after dropping index

---
 sql/ha_ndbcluster.cc | 9 ++++-----
 sql/ha_ndbcluster.h  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 70b86ca08d1..f0988affc2e 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -328,7 +328,7 @@ void ha_ndbcluster::no_uncommitted_rows_reset(THD *thd)
     #   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 @@ void ha_ndbcluster::invalidateCache()
     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 @@ int ha_ndbcluster::ndb_err(NdbConnection *trans)
   switch (err.classification) {
   case NdbError::SchemaError:
   {
-    invalidateCache();
+    invalidateDictionaryCache();
     break;
   }
   default:
@@ -759,7 +758,7 @@ int ha_ndbcluster::get_metadata(const char *path)
       if (!invalidating_ndb_table)
       {
 	DBUG_PRINT("info", ("Invalidating table"));
-        invalidateCache();
+        invalidateDictionaryCache();
 	invalidating_ndb_table= TRUE;
       }
       else
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 149276c8356..2261b56b071 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -201,7 +201,7 @@ class ha_ndbcluster: public handler
   void print_results();
 
   longlong get_auto_increment();
-  void invalidateCache();
+  void invalidateDictionaryCache();
   int ndb_err(NdbConnection*);
   bool uses_blob_value(bool all_fields);