bzr commit into mysql-5.1-telco-7.0 branch (ole.john.aske:4255)

[Ole John Aske]

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0/ based on revid:ole.john.aske@stripped

 4255 Ole John Aske	2011-03-24
      Removed temporary fix for bug 58553 as real fix now has been merged into telco branch.

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-03-23 13:15:16 +0000
+++ b/sql/ha_ndbcluster.cc	2011-03-24 10:33:55 +0000
@@ -6250,14 +6250,6 @@ int ha_ndbcluster::reset()
 
   assert(m_is_bulk_delete == false);
   m_is_bulk_delete = false;
-
-  /* 
-    Setting pushed_code=NULL here is a temporary fix for bug #58553. This
-    should not be needed any longer if http://lists.mysql.com/commits/125336 
-    is merged into this branch.
-  */
-  pushed_cond= NULL;
-
   DBUG_RETURN(0);
 }
 


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