#At file:///home/msvensson/mysql/tmp/LrG2qHD426/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)).
| Thread |
|---|
| • bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3348) | magnus.blaudd | 25 May |