bk commit into 4.1 tree (mskold:1.2498) BUG#21059

[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@stripped, 2006-08-07 13:51:20+02:00, mskold@stripped +3 -0
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  ndb/include/ndbapi/NdbConnection.hpp@stripped, 2006-08-07 13:51:09+02:00, mskold@stripped +2 -1
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  sql/ha_ndbcluster.cc@stripped, 2006-08-07 13:51:09+02:00, mskold@stripped +8 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

  sql/ha_ndbcluster.h@stripped, 2006-08-07 13:51:09+02:00, mskold@stripped +2 -0
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);

# 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.25/ndb/include/ndbapi/NdbConnection.hpp	2006-08-07 13:51:28 +02:00
+++ 1.26/ndb/include/ndbapi/NdbConnection.hpp	2006-08-07 13:51:28 +02:00
@@ -163,7 +163,8 @@
   friend class NdbIndexOperation;
   friend class NdbIndexScanOperation;
   friend class NdbBlob;
- 
+  friend class ha_ndbcluster;
+
 public:
 
   /**

--- 1.184/sql/ha_ndbcluster.cc	2006-08-07 13:51:28 +02:00
+++ 1.185/sql/ha_ndbcluster.cc	2006-08-07 13:51:28 +02:00
@@ -161,6 +161,7 @@
   if (m_batch_execute)
     return 0;
 #endif
+  h->release_completed_operations(trans);
   return trans->execute(NoCommit,AbortOnError,h->m_force_send);
 }
 
@@ -194,6 +195,7 @@
   if (m_batch_execute)
     return 0;
 #endif
+  h->release_completed_operations(trans);
   return trans->execute(NoCommit, AO_IgnoreError,h->m_force_send);
 }
 
@@ -5267,6 +5269,12 @@
     my_close(file,MYF(0));
   }
   DBUG_RETURN(error);
+}
+
+void 
+ha_ndbcluster::release_completed_operations(NdbConnection *trans)
+{
+  trans->releaseCompletedOperations();
 }
 
 int

--- 1.59/sql/ha_ndbcluster.h	2006-08-07 13:51:28 +02:00
+++ 1.60/sql/ha_ndbcluster.h	2006-08-07 13:51:28 +02:00
@@ -262,6 +262,8 @@
   void no_uncommitted_rows_init(THD *);
   void no_uncommitted_rows_reset(THD *);
 
+  void release_completed_operations(NdbConnection*);
+
   friend int execute_no_commit(ha_ndbcluster*, NdbConnection*);
   friend int execute_commit(ha_ndbcluster*, NdbConnection*);
   friend int execute_no_commit_ie(ha_ndbcluster*, NdbConnection*);