From: magnus.blaudd
Date: May 25 2011 6:56am
Subject: bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3348)
List-Archive: http://lists.mysql.com/commits/138042
Message-Id: <20110525065633.41C7E13402B@pilot>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/msvensson/mysql/tmp/rpx8DI4HOP/5.5-cluster/ based on revid:magnus.blaudd@stripped

 3348 magnus.blaudd@stripped	2011-05-25 [merge]
      Merge 7.0 -> 5.5-cluster

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

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).