From: Ole John Aske
Date: March 24 2011 10:33am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (ole.john.aske:4255)
List-Archive: http://lists.mysql.com/commits/133750
Message-Id: <20110324103359.BFD7B218@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8400494429962997901=="

--===============8400494429962997901==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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);
 }
 


--===============8400494429962997901==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   2yogonk8r3stgl3i
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0/
# testament_sha1: 9d32a7b8469b8f04939b04e362a120a28609af72
# timestamp: 2011-03-24 11:33:59 +0100
# base_revision_id: ole.john.aske@stripped\
#   ry3w43mg5peuxxwm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTzwmIsAAXhfgEAQUGP/93IQ
kAC////wUAN7tnje5mjnb2thJQpgBPQCMKeo2k9U9TajI9QNBlSM0m0T2pPIjRp6gGmgAABJEJpp
qmxNE9Q2oRp+pNNpHpD0Q0GSJPQamJo9TIA00aNADQaBJRT0aaNUweiR7SmammTQ0AB6iirmcn8z
HLEnsyqWsic3Z33W363MzHLoOcbOrjBQg8dkCZbcVr13i7yu7uGuZCpqBrFCWRzpkerKkI1LvD0C
MxWE+f5K8fHA3WFmWk9jJUjBZJEzEizhK66NSQhQxVoidZkl27ScREkBYfIbObkIDuEU5zo8PKN1
UQ0tXnMQ4uwzxqIeFxDSOVMdo/NVOR79HC0ubSa58JFmiGyNrDN/RGeQKA7YxBMOhwRqsGRJvKxO
fXc2cLrwCvEZPSJhKA4x1V58+ejIeVUTFetdwtyzLWaqihkUDhpyVLS3CJAxdQYjJ0bsuRsSrg0j
qMHxYQRCywCnkaSEWObjspMXxTj2Sp9BPfpCSyzxlpEMQxCRdEMxSxrGBYwBEN4aQhrVA5pmWoSR
r4V0137rxzUX4XTG+/rngr8GfLbNY2ThDe0tHJMiUE1jSJhObehf430by2Lp9eMki1qMmObw6ylY
o7Vr6RGBmcc3L28jX6pHKeZwSO9aaICmRDZ39ki1a8+LMzrXU63INd6ObDIMVDOo+Td61efT0xMu
DGJEK2IkjjKXI9gcKJrovlRgaKWKKRGe5rFTwq22kgF4lWKhXZ0hjSOW5s2aMOm1V/D501zpYWZj
8cH3ss+Glp/WNsHpictsGv9M6HDVEEC7jThcSHnONse6o6HkbQGXOoq8dd1rk1S+Yze5Tbow5if6
ivgrWQd+xxp9z3lBSlpQ1MMOOkujkmPfuJJpogFjfqep0g7DiF9g7n4pF5ITgVNEgtJ9x0hzFUD8
wsuEUjBIaQ3y3wenpGxd5a3Z1VO5bs6QxpMe57cIzdIZXTJBvUX73FBcXTSkTExiYqH6MfDqL/fK
RWHg2GN85AU4d+ImiS4kSgWLKKLpqSlJaJ5UQvBm00Li1qZFWGjcH4u7RHETQSX5GwkivjA/ZM8P
6WrD1zlfOzU2OnTkx+ZkhZDQAn6EkQHpVUkFbRmPAGMiLD2ClOEyTtRZlaezhfEd+05NCDAcxX9B
92bop11tU8qaEw61XWqkiWKCvTk0oHAXhWRlQf/i7kinChIHnhMRYA==


--===============8400494429962997901==--