From: magnus.blaudd
Date: June 21 2011 2:05pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4460)
List-Archive: http://lists.mysql.com/commits/139615
Message-Id: <20110621140535.A0741134016@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1915760324444792342=="

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

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

 4460 magnus.blaudd@stripped	2011-06-21
      ndb
       - set ndbtrace to link/depend on ndbsignaldata

    modified:
      storage/ndb/src/common/debugger/CMakeLists.txt
=== modified file 'storage/ndb/src/common/debugger/CMakeLists.txt'
--- a/storage/ndb/src/common/debugger/CMakeLists.txt	2011-06-21 13:58:00 +0000
+++ b/storage/ndb/src/common/debugger/CMakeLists.txt	2011-06-21 14:05:31 +0000
@@ -26,4 +26,4 @@ ADD_CONVENIENCE_LIBRARY(ndbtrace
             ${NDB_SOURCE_DIR}/src/kernel/error/ndbd_exit_codes.c
 )
 
-TARGET_LINK_LIBRARIES(ndbtrace ndblogger ndbgeneral)
+TARGET_LINK_LIBRARIES(ndbtrace ndbsignaldata ndblogger ndbgeneral)


--===============1915760324444792342==
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\
#   xsjpsnszdvyqaeso
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: e0b89d829510f79c0807aa1f0dcb2aab7cb14e2f
# timestamp: 2011-06-21 16:05:35 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   trgi11011453svb6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZXBtVoAAV9fgAAQUGP/93qv
HAC////wUANa9oFq9OO7NDRJo0maaBqnhGU9MoaB6nqepoeSGIcwAAAAAAAAAAMiGijU9MTU9Rpp
6TTag9Q09QPSGg0DJU2p5Tamj1NqeoNAAAAAAAkkJoyaJppoaMpoj0QAABpoPmsGIVM2e+gSlU5x
LMqZ3Orgs/dWiJj5ne+KBEGHtw954eWalwqdeLaYetqVzYvj3EgyFuem5ywSjUEEiadmlCtgZpau
8UjgkNfztlVuqXoZmnIHbAzGZIghjuuGwl4IeIhhzv7GKmGsIr5WzAyJ6GAvQEXahouRQRXgIcEK
q4Qvpl5ynbEsDYwrF7Rwful8ssu6ujTljvxwOjCOI8zEXzzGu5FxVxhvcOiHDbApBPEyVpUdltZh
WR5jgmNvJiM2E1kdthIiP5EO0v8h8B4pFqJaBrfwB1A6W42iHE7SL9thlmV3QuQxJ3LYF1NxceEo
VctNKsMhjY9bL9XF8aOyNoVODJtVKhbZSBjXk8Y4s+bon9MthptHRsV91d1bRZCTqIRcUVHiQDRS
8ddEk6qjdtUkb97ZECIm7GT3bm0M+X4HtVWaiFZ8mWTBsILPFweZpHBIFY33dch5GRB/GGXgDOxO
JI/FpGCRdTxERGwJ4EjS6oYVizDb6gRCuoi+SIIzMFVcWOIXlsJojHWmpJmRBhEGeN4jUWUlsEHB
ZvvYYlmBItCIWUADyQ7dVuhI+uMFsAgBlP1W57fTfKEaQbCEI4NRtirjMYUzROm7IgNiK4YEZMcB
ztXa/TICWEwAPk5ZxOqsXi4JSKA3sLCpLopUJRzv+6DHU4AU5mvXNGVCtI/B24jaBSlORgtHg2V5
j7PBNV3FDNPOHeFO/y54wkHeH16vsGE2vHFue4G3hWFbgzSIGlaQxi/j/sLrJ9BGIeo/IziSnU+h
i8GL3jTazAqKGqeIARrYCA0KzmtSwFxCocpIU2qFxC5H2CTRYZUQaGD8SIyWnTOLmSKa9EKg5c/V
NHQXiKviye3qLiYgfrO9WIn2bDxmEtLqKD8KochltSIl1VLWOc8DMHXiktbxTF0jYPJhPpG2HgDp
Bslmc5FCilaKRrhXqmEJE5DSKQFcynNhxzEiVvZKxI0HA5YhYLUyLiV4t1ago9RX2iwI/8XckU4U
JCVwbVaA


--===============1915760324444792342==--