From: magnus.blaudd
Date: June 22 2011 6:36am
Subject: bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3363)
List-Archive: http://lists.mysql.com/commits/139637
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3468147873585629513=="

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

#At file:///data0/magnus/mysql/5.5-cluster/ based on revid:magnus.blaudd@stripped

 3363 magnus.blaudd@stripped	2011-06-22
      ndb
       - fix windows compile problem, "first seen as class now using struct"

    modified:
      sql/ndb_share.h
=== modified file 'sql/ndb_share.h'
--- a/sql/ndb_share.h	2011-06-20 10:41:04 +0000
+++ b/sql/ndb_share.h	2011-06-22 06:35:38 +0000
@@ -83,7 +83,7 @@ typedef int (* prepare_detect_func) (str
                                      const uchar* old_data,
                                      const uchar* new_data,
                                      const MY_BITMAP* write_set,
-                                     struct NdbInterpretedCode* code);
+                                     class NdbInterpretedCode* code);
 
 struct st_conflict_fn_def
 {


--===============3468147873585629513==
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\
#   krqx091iro93hltz
# target_branch: file:///data0/magnus/mysql/5.5-cluster/
# testament_sha1: b3becac9edc76badd52e946c41ca02c74085e134
# timestamp: 2011-06-22 08:36:24 +0200
# source_branch: file:///data0/magnus/mysql/7.0/
# base_revision_id: magnus.blaudd@stripped\
#   7k7gltykvja7x0b6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXoDKPUAAXDfgAAQcHf//1oh
AAC////wUANF16V6e0422BoKptiTGpplPamp4kaehpqYjRpkPUEkppPKegMkwinqflT1ANqAMmTa
BKEmZUwTU02U000aNAAAABkqemoZqBkxAaMmTTRoaDJkBJRU/IaCYmp7U0RsUGJoBoAM9Yh8ZDRp
MbTKWEYAlqCrCCKbyocrd05gz6ci7eDJLkNQp9mHWfGzplzfF3Rhibog/sqs2qjr40a+vEIbjIHi
8eTpFQ4R5POgeyThPlppLe/QRpeJX2RdOO4WLN9wSjEAYUBCgZioJoBylZvG/MG2pREthaQq21dl
lcaBHEz1dSCqlNYe7fFobRystn4qQ9f+v9c7czSAR3wjTvF3kOHQCwE1BF1fTMbCvUPaFmDJLYSS
PnG6bBc5pYwo5T7F94uG6y1k3LZxRtU5RMZjilx2wK87Fz1hweaSFRw3arNqzcoUyvueXAGJjnHM
aDHQtseDCkeUlHMTOg0Ybatt9t2xPJi4YV2WKpmicV5kslQuJyqL0mWJcxLIYorVu+9rzItw1pIi
eV5CY1ULywpiLSpiLVJ12NRQWTGE5IrrMgHhfDvPphH5cHMdP69wimDJjxc728YugwfXuc9NQHOc
sR52U39dd/XuSLqrnB9hHznOmqaqRhsRTCOkMlb1zJ7KmZgLYN4IX43ANY6QecS4w1MP6qUiEvBU
Ig5G2633P6oue9HTFqkxEJyyPxkxLxDItff4x7KbC0VEOJF4aQ+RcGc6WBcwF1+z0oO9Js4F7a4o
7bPJTptQca53uOGlBODjU8iMnhtOhDmOyxwaQ8CSMSHgLtQaHd6tm8+VTTFNyKEZKloiPasSKUHC
qV6uiVbv5MfsNF7DmNOIe1Nf3ha5wZinyDFrs3JryJrUtwXC5LlgEAoaEDMRmNSGDW7bOMvBcBSQ
4iL16m4Y06lS+R15p1T3PQlDxIOSlQUssWVFMnz11p/KlFSoQZLsh7CLRkiECiAxUfORENoEZbkK
fDCXXRAzJRFOjrUmZLGi8otJ5ha3hUAY2uTmIkoxqH5wVXLUKF8jZe4SbRTuZI0X9rZCDtF+CY5w
e4GaDUu2lpXkr1hYs7dmmSnyVLFsqoOjzjTdaQEAsmTRCB4mfRSsQ15swhdw17qk3g1pg659onYl
7oqbjEBsHkzTof4u5IpwoSD0BlHq


--===============3468147873585629513==--