bk commit into 5.1 tree (mskold:1.2250)

[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, 2006-08-14 09:59:33+02:00, mskold@stripped +2 -0
  Merge mysql.com:/home/marty/MySQL/mysql-5.0
  into  mysql.com:/home/marty/MySQL/mysql-5.1
  MERGE: 1.1810.1904.6

  sql/ha_ndbcluster.cc@stripped, 2006-08-14 09:59:28+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.175.45.4

  storage/ndb/include/ndbapi/NdbTransaction.hpp@stripped, 2006-08-14 09:59:28+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.41.3.2

  storage/ndb/include/ndbapi/NdbTransaction.hpp@stripped, 2006-08-14 09:59:28+02:00, mskold@stripped +0 -0
    Merge rename: ndb/include/ndbapi/NdbTransaction.hpp -> storage/ndb/include/ndbapi/NdbTransaction.hpp

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

--- 1.41.3.1/ndb/include/ndbapi/NdbTransaction.hpp	2006-08-14 09:59:42 +02:00
+++ 1.48/storage/ndb/include/ndbapi/NdbTransaction.hpp	2006-08-14 09:59:42 +02:00
@@ -658,7 +658,7 @@ private:						
   // Release all cursor operations in connection
   void releaseOps(NdbOperation*);	
   void releaseScanOperations(NdbIndexScanOperation*);	
-  void releaseExecutedScanOperation(NdbIndexScanOperation*);
+  void releaseScanOperation(NdbIndexScanOperation*);
 
   // Set the transaction identity of the transaction
   void		setTransactionId(Uint64 aTransactionId);
@@ -794,7 +794,7 @@ private:						
   Uint8 thePendingBlobOps;
   inline bool hasBlobOperation() { return theBlobFlag; }
 
-  static void sendTC_COMMIT_ACK(NdbApiSignal *,
+  static void sendTC_COMMIT_ACK(class TransporterFacade *, NdbApiSignal *,
 				Uint32 transId1, Uint32 transId2, 
 				Uint32 aBlockRef);
 

--- 1.348/sql/ha_ndbcluster.cc	2006-08-14 09:59:42 +02:00
+++ 1.349/sql/ha_ndbcluster.cc	2006-08-14 09:59:42 +02:00
@@ -9591,6 +9591,13 @@ void 
 ha_ndbcluster::release_completed_operations(NdbTransaction *trans,
 					    bool force_release)
 {
+  if (trans->hasBlobOperation())
+  {
+    /* We are reading/writing BLOB fields, 
+       releasing operation records is unsafe
+    */
+    return;
+  }
   if (!force_release)
   {
     if (get_thd_ndb(current_thd)->query_state & NDB_QUERY_MULTI_READ_RANGE)