bk commit into 5.1 tree (mskold:1.2610)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.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@stripped, 2007-08-20 18:10:26+02:00, mskold@stripped +2 -0
  ha_ndbcluster_binlog.cc:
    Remove incorrect resource cleanup
  NdbDictionaryImpl.cpp:
    Disable on-line ALTER of BLOBS (except TINYTEXT)

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-08-20 18:10:13+02:00, mskold@stripped +0 -12
    Remove incorrect resource cleanup

  storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp@stripped, 2007-08-20 18:09:42+02:00, mskold@stripped +2 -2
    Disable on-line ALTER of BLOBS (except TINYTEXT)

# 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:	/windows/Linux_space/MySQL/mysql-5.1-telco-6.2

--- 1.172/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2007-08-20 18:10:37 +02:00
+++ 1.173/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2007-08-20 18:10:37 +02:00
@@ -2599,7 +2599,8 @@ NdbDictInterface::compChangeMask(const N
          col->m_storageType == NDB_STORAGETYPE_DISK ||
          col->m_pk ||
          col->m_distributionKey ||
-         col->m_autoIncrement                   // ToDo: allow this?
+         col->m_autoIncrement ||                   // ToDo: allow this?
+	 (col->getBlobType() && col->getPartSize())
          )
         goto invalid_alter_table;
     }
@@ -4258,7 +4259,6 @@ static int scanEventTable(Ndb* pNdb, 
 {
   int                  retryAttempt = 0;
   const int            retryMax = 100;
-  int                  check;
   NdbTransaction       *pTrans = NULL;
   NdbScanOperation     *pOp = NULL;
   NdbRecAttr *event_name, *event_id;

--- 1.128/sql/ha_ndbcluster_binlog.cc	2007-08-20 18:10:37 +02:00
+++ 1.129/sql/ha_ndbcluster_binlog.cc	2007-08-20 18:10:37 +02:00
@@ -1873,22 +1873,10 @@ ndb_handle_schema_change(THD *thd, Ndb *
               share->op == pOp || ndb_is_old_event_op(share, pOp));
   if (ndb_is_old_event_op(share, pOp))
   {
-    Ndb_event_data *event_data= (Ndb_event_data *) pOp->getCustomData();
-    if (event_data)
-    {
-      pOp->setCustomData(NULL);
-      delete event_data;
-    }
     ndb_remove_old_event_op(share, pOp);
   }
   else if (share->op)
   {
-    Ndb_event_data *event_data= (Ndb_event_data *) share->op->getCustomData();
-    if (event_data)
-    {
-      delete event_data;
-      share->op->setCustomData(NULL);
-    }
     share->op= 0;
   }
   // either just us or drop table handling as well