bk commit into 4.1 tree (mskold:1.2488)

[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.2488 06/05/31 14:32:01 mskold@stripped +2 -0
  Removed dead code that had been commented out

  ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.23 06/05/31 14:28:41 mskold@stripped +0 -1
    Removed dead code that had been commented out

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.56 06/05/31 14:28:41 mskold@stripped +1 -1
    Removed dead code that had been commented out

# 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-4.1

--- 1.55/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-05-05 17:18:37 +02:00
+++ 1.56/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-05-31 14:28:41 +02:00
@@ -2147,7 +2147,7 @@
     m_error.code = 4243;
     return -1;
   }
-  int ret = dropIndex(*idx); //, tableName);
+  int ret = dropIndex(*idx);
   // If index stored in cache is incompatible with the one in the kernel
   // we must clear the cache and try again
   if (ret == INCOMPATIBLE_VERSION) {

--- 1.22/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-05-05 17:18:37 +02:00
+++ 1.23/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-05-31 14:28:41 +02:00
@@ -379,7 +379,6 @@
   int createIndex(NdbIndexImpl &ix);
   int dropIndex(const char * indexName, 
 		const char * tableName);
-  //  int dropIndex(NdbIndexImpl &, const char * tableName);
   int dropIndex(NdbIndexImpl &);
   NdbTableImpl * getIndexTable(NdbIndexImpl * index, 
 			       NdbTableImpl * table);