bk commit into 5.0 tree (mskold:1.2137) BUG#16997

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 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.2137 06/05/24 10:58:12 mskold@stripped +3 -0
  Bug #16997 Table rename that changes database does not rename indexes: merge

  ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.36 06/05/24 10:57:27 mskold@stripped +2 -1
    Bug #16997 Table rename that changes database does not rename indexes: merge

  ndb/src/ndbapi/NdbDictionary.cpp
    1.37 06/05/24 10:57:27 mskold@stripped +1 -1
    Bug #16997 Table rename that changes database does not rename indexes: merge

  ndb/include/ndbapi/NdbDictionary.hpp
    1.54 06/05/24 10:57:27 mskold@stripped +15 -14
    Bug #16997 Table rename that changes database does not rename indexes: merge

# 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:	linux.site
# Root:	/home/marty/MySQL/mysql-5.0

--- 1.53/ndb/include/ndbapi/NdbDictionary.hpp	2006-05-22 15:16:31 +02:00
+++ 1.54/ndb/include/ndbapi/NdbDictionary.hpp	2006-05-24 10:57:27 +02:00
@@ -1183,6 +1183,15 @@
 			   const char * tableName) const;
 
     /**
+     * Get index with given name, NULL if undefined
+     * @param indexName  Name of index to get.
+     * @param Table instance table that index belongs to.
+     * @return  index if successful, otherwise 0.
+     */
+    const Index * getIndex(const char * indexName,
+			   const Table & table) const;
+
+    /**
      * Fetch list of indexes of given table.
      * @param list  Reference to list where to store the listed indexes
      * @param tableName  Name of table that index belongs to.
@@ -1301,23 +1310,15 @@
      */
     int dropIndex(const char * indexName,
 		  const char * tableName);
-    /**
-     * Get index with given name, NULL if undefined
-     * @param indexName  Name of index to get.
-     * @param tableName  Name of table that index belongs to.
-     * @return  index if successful, otherwise 0.
-     */
-    const Index * getIndex(const char * indexName,
-			   const char * tableName);
 
     /**
-     * Get index with given name, NULL if undefined
-     * @param indexName  Name of index to get.
-     * @param Table instance table that index belongs to.
-     * @return  index if successful, otherwise 0.
+     * Drop index the defined Index instance
+     * @param Index to drop
+     * @return 0 if successful otherwise -1.
      */
-    const Index * getIndex(const char * indexName,
-			   const Table & table);
+    int dropIndex(const Index &);
+
+
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
     /**
      * Invalidate cached index object

--- 1.36/ndb/src/ndbapi/NdbDictionary.cpp	2006-05-22 14:39:33 +02:00
+++ 1.37/ndb/src/ndbapi/NdbDictionary.cpp	2006-05-24 10:57:27 +02:00
@@ -818,7 +818,7 @@
 
 const NdbDictionary::Index * 
 NdbDictionary::Dictionary::getIndex(const char * indexName,
-				    const Table & t)
+				    const Table & t) const
 {
   NdbIndexImpl * i = m_impl.getIndex(indexName, & NdbTableImpl::getImpl(t));
   if(i)

--- 1.35/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-05-22 15:16:31 +02:00
+++ 1.36/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-05-24 10:57:27 +02:00
@@ -702,6 +702,7 @@
 NdbIndexImpl * 
 NdbDictionaryImpl::getIndex(const char * index_name,
 			    const char * table_name)
+{
   return getIndex(index_name, (table_name) ? getTable(table_name) : NULL);
 }
 
@@ -710,7 +711,7 @@
 NdbDictionaryImpl::getIndex(const char * index_name,
 			    NdbTableImpl * table)
 {
-  if (table || m_ndb.usingFullyQualifiedNames()) {
+  if (table || m_ndb.usingFullyQualifiedNames())
   {
     const BaseString internal_indexname(
       (table)