bk commit into 5.0 tree (mskold:1.2168)

[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.2168 06/06/02 09:02:53 mskold@stripped +4 -0
  Merge mysql.com:/home/marty/MySQL/mysql-4.1
  into  mysql.com:/home/marty/MySQL/mysql-5.0

  sql/handler.h
    1.171 06/06/02 09:02:48 mskold@stripped +0 -1
    Merge

  sql/ha_ndbcluster.cc
    1.250 06/06/02 09:02:10 mskold@stripped +0 -0
    Auto merged

  ndb/src/ndbapi/NdbDictionaryImpl.hpp
    1.37 06/06/02 09:02:10 mskold@stripped +0 -0
    Auto merged

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.92 06/06/02 09:02:10 mskold@stripped +0 -0
    Auto merged

# 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/RESYNC

--- 1.91/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-05-31 15:32:21 +02:00
+++ 1.92/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2006-06-02 09:02:10 +02:00
@@ -2267,7 +2267,7 @@ NdbDictionaryImpl::dropIndex(const char 
     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.36/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-05-24 10:57:27 +02:00
+++ 1.37/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-06-02 09:02:10 +02:00
@@ -395,7 +395,6 @@ public:
   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);

--- 1.249/sql/ha_ndbcluster.cc	2006-05-31 15:32:24 +02:00
+++ 1.250/sql/ha_ndbcluster.cc	2006-06-02 09:02:10 +02:00
@@ -4085,6 +4085,12 @@ int ha_ndbcluster::create(const char *na
   set_dbname(name2);
   set_tabname(name2);    
 
+  if (current_thd->lex->sql_command == SQLCOM_TRUNCATE)
+  {
+    DBUG_PRINT("info", ("Dropping and re-creating table for TRUNCATE"));
+    if ((my_errno= delete_table(name)))
+      DBUG_RETURN(my_errno);
+  }
   if (create_from_engine)
   {
     /*