Commit 83cd9eca authored by unknown's avatar unknown
Browse files

Bug #16997 Table rename that changes database does not rename indexes: merge

parent 98268bf0

ndb/include/ndbapi/NdbDictionary.hpp

+15 −14
Original line number Diff line number Diff line
@@ -1182,6 +1182,15 @@ public: 
    const Index * getIndex(const char * indexName,

			   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
@@ -1301,23 +1310,15 @@ public: 
     */

    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

ndb/src/ndbapi/NdbDictionary.cpp

+1 −1
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ NdbDictionary::Dictionary::getIndex(const char * indexName, 


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)

ndb/src/ndbapi/NdbDictionaryImpl.hpp

+2 −1
Original line number Diff line number Diff line
@@ -702,6 +702,7 @@ inline 
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 @@ NdbIndexImpl * 
NdbDictionaryImpl::getIndex(const char * index_name,

			    NdbTableImpl * table)

{

  if (table || m_ndb.usingFullyQualifiedNames()) {

  if (table || m_ndb.usingFullyQualifiedNames())

  {

    const BaseString internal_indexname(

      (table)