bzr commit into mysql-5.1-telco-7.1 branch (frazer:3806)

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.1-telco-7.1/ based on revid:jonas@stripped

 3806 Frazer Clement	2010-09-14 [merge]
      Merge 7.0->7.1

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-09-02 09:53:35 +0000
+++ b/sql/ha_ndbcluster.cc	2010-09-14 16:10:14 +0000
@@ -689,8 +689,7 @@ check_completed_operations(Thd_ndb *thd_
 }
 
 void
-ha_ndbcluster::release_completed_operations(Thd_ndb *thd_ndb,
-                                            NdbTransaction *trans)
+ha_ndbcluster::release_completed_operations(NdbTransaction *trans)
 {
   /**
    * mysqld reads/write blobs fully,
@@ -712,7 +711,7 @@ int execute_no_commit(Thd_ndb *thd_ndb, 
                       uint *ignore_count)
 {
   DBUG_ENTER("execute_no_commit");
-  ha_ndbcluster::release_completed_operations(thd_ndb, trans);
+  ha_ndbcluster::release_completed_operations(trans);
   const NdbOperation *first= trans->getFirstDefinedOperation();
   thd_ndb->m_execute_count++;
   DBUG_PRINT("info", ("execute_count: %u", thd_ndb->m_execute_count));
@@ -774,7 +773,7 @@ inline
 int execute_no_commit_ie(Thd_ndb *thd_ndb, NdbTransaction *trans)
 {
   DBUG_ENTER("execute_no_commit_ie");
-  ha_ndbcluster::release_completed_operations(thd_ndb, trans);
+  ha_ndbcluster::release_completed_operations(trans);
   int res= trans->execute(NdbTransaction::NoCommit,
                           NdbOperation::AO_IgnoreError,
                           thd_ndb->m_force_send);
@@ -3029,7 +3028,7 @@ inline int ha_ndbcluster::fetch_next(Ndb
        nextResult() on Blobs generates Blob part read ops,
        so we will free them here
     */
-    release_completed_operations(m_thd_ndb, trans);
+    release_completed_operations(trans);
     
     if ((local_check= cursor->nextResult(&_m_next_row,
                                          contact_ndb,

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2010-06-03 14:12:46 +0000
+++ b/sql/ha_ndbcluster.h	2010-09-14 16:10:14 +0000
@@ -498,7 +498,7 @@ static void set_tabname(const char *path
     static member function as it needs to access private
     NdbTransaction methods
   */
-  static void release_completed_operations(Thd_ndb*, NdbTransaction*);
+  static void release_completed_operations(NdbTransaction*);
 
   /*
     Condition pushdown


Attachment: [text/bzr-bundle] bzr/[e-mail]