From: Ole John Aske
Date: March 24 2011 10:36am
Subject: bzr push into mysql-5.1-telco-7.0 branch (ole.john.aske:4255 to 4256)
List-Archive: http://lists.mysql.com/commits/133752
Message-Id: <20110324103615.9D2A0218@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4256 Ole John Aske	2011-03-24
      Removed temporary fix for bug 58553 as real fix now has been merged into telco branch.
      Recommit after push / merge conflicts.

    modified:
      sql/ha_ndbcluster.cc
 4255 Jonas Oreland	2011-03-24
      ndb - bug#11885852 - ndb_restore -e inserts a too low gci value

    modified:
      mysql-test/suite/ndb/r/ndb_restore_compat_downward.result
      mysql-test/suite/ndb/r/ndb_restore_misc.result
      storage/ndb/tools/restore/consumer_restore.cpp
=== 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:35:46 +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);
 }
 

No bundle (reason: useless for push emails).