bk commit into 5.0 tree (gni:1.2476) BUG#29851

[gni]

Below is the list of changes that have just been committed into a local
5.0 repository of gni. When gni 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@stripped, 2007-08-31 16:03:53+08:00, gni@stripped +1 -0
  BUG#29851 TRUNCATE causes error 4350 from cluster in INSERT... ON DUPLICATE KEY UPDATE

  sql/ha_ndbcluster.cc@stripped, 2007-08-31 16:03:51+08:00, gni@stripped +4 -0
    Indexes are dropped also when dropping table in GlobalDictCache

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.0/bug29851

--- 1.314/sql/ha_ndbcluster.cc	2007-08-31 16:03:59 +08:00
+++ 1.315/sql/ha_ndbcluster.cc	2007-08-31 16:03:59 +08:00
@@ -459,6 +459,7 @@
   }
   else
     dict->removeCachedTable(m_tabname);
+  build_index_list(get_ndb(), table, ILBP_OPEN);
   table->s->version=0L;			/* Free when thread is ready */
   /* Invalidate indexes */
   for (uint i= 0; i < table->s->keys; i++)
@@ -470,17 +471,20 @@
     switch (idx_type) {
     case PRIMARY_KEY_ORDERED_INDEX:
     case ORDERED_INDEX:
+      if (!index) break;
       if (global)
         dict->invalidateIndex(index->getName(), m_tabname);
       else
         dict->removeCachedIndex(index->getName(), m_tabname);
       break;
     case UNIQUE_ORDERED_INDEX:
+      if (!index) break;
       if (global)
         dict->invalidateIndex(index->getName(), m_tabname);
       else
         dict->removeCachedIndex(index->getName(), m_tabname);
     case UNIQUE_INDEX:
+      if (!unique_index) break;
       if (global)
         dict->invalidateIndex(unique_index->getName(), m_tabname);
       else