bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:3923 to 3924)

[magnus.blaudd]

 3924 magnus.blaudd@stripped	2012-05-16
      ndb
       - Don't turn off transitive linking for ndbclient_so on Windows yet

    modified:
      storage/ndb/src/CMakeLists.txt
 3923 magnus.blaudd@stripped	2012-05-09
      ndb
       - Turn off cmake's "transitive linking" for the share ndbclient library by
         using the LINK_INTERFACE_LIBARIES property. Previously anyone linking
         against shared ndbclient would also link against against the library which
         ndbclient was created from and thus resolve any unresolved depdendencies
         from those. That is no longer possible and causes a few link failures
         in our test* programs.
       - Add more references to ndbclient_exports.cpp to make more functions
         become exported from the shared ndbclient.
        - Note the number 37 passed to BitmaskImpl::setField, it has to be higher
         than 32 to avoid that BitmaskImpl::setFieldImpl() is optimized away in
         release compile.
       - Add more code to ndbclient_link_test.cpp to detect any missing symbols
         early.

    modified:
      storage/ndb/src/CMakeLists.txt
      storage/ndb/src/ndbclient_exports.cpp
      storage/ndb/src/ndbclient_link_test.cpp
=== modified file 'storage/ndb/src/CMakeLists.txt'
--- a/storage/ndb/src/CMakeLists.txt	2012-05-09 12:44:49 +0000
+++ b/storage/ndb/src/CMakeLists.txt	2012-05-16 07:55:43 +0000
@@ -64,9 +64,12 @@ SET(NDB_SHARED_LIB_VERSION "${major}.${m
 
 ADD_LIBRARY(ndbclient_so SHARED ndbclient_exports.cpp)
 TARGET_LINK_LIBRARIES(ndbclient_so ${NDBCLIENT_SO_LIBS})
-# Turn off cmake's transitive link behaviour, the shared
-# ndbclient is self contained
-TARGET_LINK_LIBRARIES(ndbclient_so LINK_INTERFACE_LIBRARIES)
+IF (NOT MSVC)
+  # Turn off cmake's transitive link behaviour, the shared
+  # ndbclient is self contained
+  # (not yet on Windows)
+  TARGET_LINK_LIBRARIES(ndbclient_so LINK_INTERFACE_LIBRARIES)
+ENDIF()
 SET_TARGET_PROPERTIES(ndbclient_so PROPERTIES
   OUTPUT_NAME "ndbclient"
   SOVERSION ${NDB_SHARED_LIB_VERSION})

No bundle (reason: useless for push emails).