From: magnus.blaudd
Date: June 22 2011 6:40am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4473)
List-Archive: http://lists.mysql.com/commits/139639
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8812778815784998720=="

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

#At file:///data0/magnus/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4473 magnus.blaudd@stripped	2011-06-22
      ndb
       - remove uncessary forward declaration of NdbInterpretedCode

    modified:
      sql/ha_ndbcluster.h
=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-06-16 18:16:01 +0000
+++ b/sql/ha_ndbcluster.h	2011-06-22 06:39:41 +0000
@@ -45,7 +45,6 @@ class NdbIndexScanOperation; 
 class NdbBlob;
 class NdbIndexStat;
 class NdbEventOperation;
-class NdbInterpretedCode;
 class ha_ndbcluster_cond;
 class Ndb_event_data;
 
@@ -171,7 +170,7 @@ typedef int (* prepare_detect_func) (str
                                      const uchar* old_data,
                                      const uchar* new_data,
                                      const MY_BITMAP* write_set,
-                                     NdbInterpretedCode* code);
+                                     class NdbInterpretedCode* code);
 
 struct st_conflict_fn_def
 {


--===============8812778815784998720==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   ou01bswxexwosq5e
# target_branch: file:///data0/magnus/mysql/7.0/
# testament_sha1: 12c5f94b64eb78b1dc2f7d98ba336b071b6e053c
# timestamp: 2011-06-22 08:40:10 +0200
# base_revision_id: magnus.blaudd@stripped\
#   taqc6h9gvbdzdkf5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZYSAYIAAWtfgAAQcHP//1oh
AAC////wUAOHc72y916ajE4SSFTwCJ4E0JjU1PanlTanpBpk9TCUVNhJP0xNU9T0aE0YgAYmmmmQ
ZCaTRpoTKaeo02oAAAGgwklGmmjUxJ+qepmUNGnlGmgGgBhJIibITNDVJp7JNT9Keo8p6gBiH6p4
4Xt7ZHaqxujG3XNOsGRK7CEGwdBtaldVlgwzHt1XvCOWZ/BmaDnV+vvv62fnuPq8f67Fgju27/1f
VFZmnMiS146MgI+KXl5dhTQKUtSwuo1iLkjmXDksjQTpUtd3p2xQQr7gXtO0RuMVKEBAb4Fi6dzT
BgFBls8KgRmODZIkdHnB5vUNWhsQcJuFmCfc2rw10Eg+MOKCndIWUKCRndYlRqMqiHdggRQK/C59
JzaNYwJO6iOJgZU2vMThVdTHraPoF00hnA9Bplsry9PmJ48lw0elFqyVNUFYNtGQ5MxN5aUhfFm0
OjBw2UrCFCJTMLa3CrGqgklE64Uc+UZVAoyFB5ahmYXrhemmv1uHqW4q1nJG6YxfaqtolIVOm4xm
Q7IWVxg4ZBxcXjBJAMGxvB10E7bkr6TPHCx1ySu1IoAmCmCl1ijiQR+DaaGVcrdLF59nvEQjZMft
4/cbiKaCNizvgcnBy9khs6FtNduyRvtcHcRYX3Khlfy/1aIviqnCNbuWOsechl3VN0RoI9MBcEXz
lxJSZqSmg4DtJJRsXtHhOkQXXpSI7zXCUsZFlqcm3ONtC5RFQ/8GVdFoj1VVnE81R4XLUauPk8eP
BO2jaN+OJA6lHOu/o508oZSUtGX79XVmM4G7PDUQa+pxjGxsTKla2txcT7psWgKlbCfpedfseETD
GaYccT4cSRh6Z88zvo8izQOaJmET7Dms1X6JvIO2woqUqtIuBVH3TRYmRWnluYT3+vCT6rw6Bzdb
QTKCxrlIMpH1cFYVuCJyEaOSGOJlLvDcsDoIyX4NBnGirpfaT1MqdcYQI7FdQbm41GDUhDxW555a
/O2w2GW5lQIcviSx28WjhOCpR4uP9IyCpb2mWApSFutOxW6mZTjPyjjRaP8q6xc6aGU+AtCSznLW
Q8rzcU7IKPC91T0/axFi2QiEw+xX1vxCak7mzzaIoaIrcRWhF4qJM2o0qKdEet9JM68DvXfncPtL
ArCll4VClOAjyujARVcunMZD6FiFhvO1A8vFWLUWsFyGFEJYLEo3i7kinChISwkAwQA=


--===============8812778815784998720==--