bk commit into 5.1 tree (jonas:1.2281)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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-17 20:51:44+02:00, jonas@stripped +2 -0
  merge

  sql/ha_ndbcluster.cc@stripped, 2006-08-17 20:51:41+02:00, jonas@stripped +0 -18
    merge

  sql/ha_ndbcluster.h@stripped, 2006-08-17 20:51:41+02:00, jonas@stripped +0 -1
    merge

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new-ndb

--- 1.349/sql/ha_ndbcluster.cc	2006-08-17 20:51:48 +02:00
+++ 1.350/sql/ha_ndbcluster.cc	2006-08-17 20:51:48 +02:00
@@ -9611,24 +9611,6 @@
   DBUG_RETURN(0);
 }
 
-
-void 
-ha_ndbcluster::release_completed_operations(NdbTransaction *trans,
-					    bool force_release)
-{
-  if (!force_release)
-  {
-    if (get_thd_ndb(current_thd)->query_state & NDB_QUERY_MULTI_READ_RANGE)
-    {
-      /* We are batching reads and have not consumed all fetched
-	 rows yet, releasing operation records is unsafe 
-      */
-      return;
-    }
-  }
-  trans->releaseCompletedOperations();
-}
-
 /*
   get table space info for SHOW CREATE TABLE
 */

--- 1.146/sql/ha_ndbcluster.h	2006-08-17 20:51:48 +02:00
+++ 1.147/sql/ha_ndbcluster.h	2006-08-17 20:51:48 +02:00
@@ -907,7 +907,6 @@
   bool m_force_send;
   ha_rows m_autoincrement_prefetch;
   bool m_transaction_on;
-  void release_completed_operations(NdbTransaction*, bool);
 
   Ndb_cond_stack *m_cond_stack;
   bool m_disable_multi_read;