bk commit into 5.0 tree (mskold:1.2204) BUG#21059

[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@stripped, 2006-08-14 09:42:51+02:00, mskold@stripped +2 -0
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables:
Post review fix, not releasing operation records if BLOB operations

  ndb/include/ndbapi/NdbTransaction.hpp@stripped, 2006-08-14 09:42:31+02:00, mskold@stripped
+1 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables:
Post review fix, not releasing operation records if BLOB operations

  sql/ha_ndbcluster.cc@stripped, 2006-08-14 09:42:31+02:00, mskold@stripped +7 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables:
Post review fix, not releasing operation records if BLOB operations

# 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

--- 1.45/ndb/include/ndbapi/NdbTransaction.hpp	2006-08-14 09:42:59 +02:00
+++ 1.46/ndb/include/ndbapi/NdbTransaction.hpp	2006-08-14 09:42:59 +02:00
@@ -792,6 +792,7 @@ private:						
   // optim: any blobs
   bool theBlobFlag;
   Uint8 thePendingBlobOps;
+  inline bool hasBlobOperation() { return theBlobFlag; }
 
   static void sendTC_COMMIT_ACK(NdbApiSignal *,
 				Uint32 transId1, Uint32 transId2, 

--- 1.265/sql/ha_ndbcluster.cc	2006-08-14 09:42:59 +02:00
+++ 1.266/sql/ha_ndbcluster.cc	2006-08-14 09:42:59 +02:00
@@ -7865,6 +7865,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)