From: magnus.blaudd
Date: May 25 2011 6:52am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4413)
List-Archive: http://lists.mysql.com/commits/138040
Message-Id: <20110525065238.5523D13402B@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4251817111610880202=="

--===============4251817111610880202==
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

 4413 magnus.blaudd@stripped	2011-05-25
      ndb
         - link NdbGetInAddr-t also with the nsl library

    modified:
      storage/ndb/src/common/portlib/CMakeLists.txt
=== modified file 'storage/ndb/src/common/portlib/CMakeLists.txt'
--- a/storage/ndb/src/common/portlib/CMakeLists.txt	2011-05-24 14:33:47 +0000
+++ b/storage/ndb/src/common/portlib/CMakeLists.txt	2011-05-25 06:52:33 +0000
@@ -40,7 +40,7 @@ TARGET_LINK_LIBRARIES(NdbDir-t ndbportli
 ADD_EXECUTABLE(NdbGetInAddr-t NdbTCP.cpp)
 SET_TARGET_PROPERTIES(NdbGetInAddr-t
                       PROPERTIES COMPILE_FLAGS "-DTEST_NDBGETINADDR")
-TARGET_LINK_LIBRARIES(NdbGetInAddr-t ${LIBSOCKET})
+TARGET_LINK_LIBRARIES(NdbGetInAddr-t ${LIBSOCKET} ${LIBNSL})
 
 
 


--===============4251817111610880202==
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\
#   b6w0siz64sigw9db
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 9712c796bd3529dc67797d9944e4c805f475343e
# timestamp: 2011-05-25 08:52:38 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   kkwgelrmmqmx9n22
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbb+m8oAAW9fgAAQVGP/93qv
nAC/7//6UAN673vLZ4aR5728MiRJsaRtRk1PTUw0E0MJhHqNqaZNBKUpvVP1TzIyaaKZonqP1QAD
TJo00NMgJRAEp4NInomQGgNAAAABtSQyEnoyaYp6amnqaaAAAA0AJKER6TBE9qep6oZPU0G0gAAA
DDGK+OTWUvYoyGDZgMFwytbJa/73k27pxVVPPwSLo13MRGMX4f4L24103LVikfVEczRHQzQVQiYc
UnzrnHMcwRGpt1GmjKU5brtCmzz/IK0E1VE0c8aNxsRDmWCycN+GIQ4rIiyUFpANaeqZm7PsWO0T
3qyx4i8jrqEHYlMU98WKPlKg8zBjug6h8LuRY2iNLCuYQtLhWMx0piIWKI2ZDKStioN3tD0lPamV
iNnpUiI8HuxLI8TNJc8UpO9a0VKws0SYPEtR0Rj7qz7zyKr7jicWEiIi2E4lKhHCEH31dbsAmwoI
Re6EvujJRAeMP0TBUEtRcXblNqGDMcxAlWQFC5hPrZodfkTXlNkbG65MxU5HxB49hO8hk20jKqE6
2FAvrLdiqlR+kcvCIrUfOlH3yeXWrBUFvYMc1FgrSQQiushyZhncdO5SR06Pi1AgRE+jX0hfe++c
E4sKpdFnTv1RIvl9tVml9n6L8TJWB2DVO66CtfF4YFAqzDbl217yRsEb7XiayR134XOtcWkLbO8k
UaiIU3SLA4HcrDtoo4PVkjk1gygNCjeKFgXhKqBnfxhkTkpIuEi5rcMY5XslU84gmuUyKhRGzzpy
Q0cxV4DnMMxCogkbSbSXnr6VljcuDADfaKV/psY1aPLTmCyNgIjvYcf36yIKaWyppcojImHMoaJZ
s1NMI+RbA8CyjOKohkxB8Yoh20a/FBUIAbCgvISNHiy38IzODn2kq1MbseIZl6NqZiiVCinEIhVT
36M01Aag89GmZKjNEv3tyAQWH9cqZAwKmhxpFWpiQwlIsz8706jZYIrkHwe4xpwJ+J1hJwTpqnnG
qse9bBvVMqpZEpbqU+O5nKEYomNYJxrvwrqivAeln5WUi/gWATnInGbFQyU1sxEpMdE2p9EC2CsL
ectpECQ8J0GyrGVzpJI4rL1rMpMjbUQnKl1JBvYJoDnEbnmmNNeqGJVYWBZqja51F7uW90xjjBaZ
ymwyWzVQmmCdJnOId9koLGDwWntTilJ2KN5Gw6lVmGY35YS8fNL4LkD3cV7P8XckU4UJC2/pvKA=


--===============4251817111610880202==--