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

--===============8509251158831053015==
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:jonas@stripped

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


--===============8509251158831053015==
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\
#   p2lp52g27cqfn76c
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0/
# testament_sha1: b9b48742cb66dc7a4631309180cae01cc2b2322c
# timestamp: 2011-03-24 11:35:51 +0100
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbjur6sAAYbfgAAQUGP/93IQ
kAC////wUAOV7jbOu3e7U91r2EoSBTT0Yp5qbUnoGUeggep6g0CURAYmUYSepk9T1PU9RoGgGgEk
SMJoJk0ap6nknpNGRp6gaBoMUozU00MTajQbUAeoAAASUEaammajIZI8iehA0A0NDsDloNlbIlDb
J5UqFVrFnZdXx2WQVVOXifM1NXk1GtZq6TLLszfnGdsu3y7tkX6Xy6GWdieViql762ixRlQ4ucdB
FpTisfos24PAus7X5b7IRAuWEkxK9gGomqdbW0KMYMyqti1d2hKxIj4yTgDGo90FBx3CCczJPD30
vQ/Oa8oiHF6am3dVIeFTfZ0nC7f21PRRIfuuUiusmY05/GRWcrsNHLPW0bsCvoW54p0HsLF8eYkj
qYwtgKaRNQm2UdJat00KBCbVea5oxMEuLXlBRnqOo9Y33k6zl+ZbHoHPJTF0G2ZiBUKvXus3KhUh
P/fAuhpumYvme0UuHKgp3487Fsc4V4k+TnVZcbbBXDSeyi2uOu/aRdy3SWpHNFzTLFhaY768ZZLp
HgLUUmojGpKSQEjcYjsEugtpdSycvfTDhucjiOj74X8McC/Bqy0mF0b6bmjoDljEoJotaTCUm+hj
38KLrpSzrz4JIB3aGBTNnQiXRPGhgk3SIUOGtk5QN+IDouaF+iT6yjQScgyx9CdgF6aWZEc9MOAc
aIYqYm0PFowYbjQtZR4TVWl87GASXIikdkpchRUZlrordMI3ziQtKcIimGWhCsRbYU4kCApp6oWK
oJDIPDDhOBDcYNRQF+H5si/rL32PYfWVXb0nqZTJSspVqjQmJwd1zbjThg4gEy5jR2wiZZ1iY6Rh
ztduKyWfl5pDdWIzkxxwG5VCXwkQWji66tFD16Gmf2MuqBYdyw79Br88/VMhkak0lEKW9MNL7Q4H
gHeUj5cwKFealMghPYGo2hvRAIBO0XXjmA2gNK45WZZCrRUSMVPY0vNDCR37pyHo/8VN1s3AagmK
sqGRaA42Qx8eAdL1wRopFGWh64mlv38AHehAJmiQg3hFXQoX7AYB5wTOtcvFN1XEXQWJtmzKJPZ6
8mzT08jSKpHAi5U4diTQXyMzPRTk4+iC3/pQpcbpsZR2MHTEZDp84+Sy4UcrsDetwFx5t4eDU7Bg
XqCFcLfUay82rueucySaZ+1fR2xIVgoZTMSUDZhk3VI4SXjXStgVDrqxo9Dw2HAKHlsDincV/i7k
inChIXHdX1Y=


--===============8509251158831053015==--