bzr push into mysql-5.5-cluster branch (jonas.oreland:3377 to 3378)

[Jonas Oreland]

 3378 Jonas Oreland	2011-06-28
      ndb - produce both static and so lib of libndbclient

    modified:
      storage/ndb/config/type_ndbapitest.cmake
      storage/ndb/src/CMakeLists.txt
 3377 Jonas Oreland	2011-06-27
      ndb - fix --suite=ndb_team (remove second cluster...not needed)...ndb_autodiscover3 fails...this seems like a bug\!

    modified:
      mysql-test/suite/ndb_team/my.cnf
      mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result
=== modified file 'storage/ndb/config/type_ndbapitest.cmake'
--- a/storage/ndb/config/type_ndbapitest.cmake	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/config/type_ndbapitest.cmake	2011-06-28 12:19:31 +0000
@@ -14,11 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 LINK_LIBRARIES(ndbNDBT
-               ndbclient
-               dbug
-               mysys
-               strings)
-
+               ndbclient_so)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_BINARY_DIR}/include

=== modified file 'storage/ndb/src/CMakeLists.txt'
--- a/storage/ndb/src/CMakeLists.txt	2011-06-21 14:09:17 +0000
+++ b/storage/ndb/src/CMakeLists.txt	2011-06-28 12:19:31 +0000
@@ -38,11 +38,19 @@ SET(NDBCLIENT_LIBS
                 ndbgeneral
                 ndbconf)
 
+MERGE_LIBRARIES(ndbclient STATIC ${NDBCLIENT_LIBS} COMPONENT Development)
+
+#
+# Do a shared libd
+#
+SET(NDBCLIENT_SO_LIBS ${NDBCLIENT_LIBS})
+SET(EXTRA_SRC)
+
 IF(HAVE_JDK AND HAVE_JAVA)
 
   ADD_SUBDIRECTORY(ndbjtie)
 
-  SET(NDBCLIENT_LIBS ${NDBCLIENT_LIBS} mysqlutils ndbjtie)
+  SET(NDBCLIENT_SO_LIBS ${NDBCLIENT_SO_LIBS} mysqlutils ndbjtie)
 
   INCLUDE_DIRECTORIES(${JNI_INCLUDE_DIRS})
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include/ndbapi
@@ -53,11 +61,11 @@ IF(HAVE_JDK AND HAVE_JAVA)
                       ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/mysql
                      )
   # JNI needs a DLL
-  ADD_LIBRARY(ndbclient 
-    SHARED ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/ndbjtie_lib.cpp)
-  SET_TARGET_PROPERTIES(ndbclient PROPERTIES OUTPUT_NAME "ndbclient")
-  TARGET_LINK_LIBRARIES(ndbclient ${NDBCLIENT_LIBS})
-
-ELSE()
-  MERGE_STATIC_LIBS(ndbclient ndbclient "${NDBCLIENT_LIBS}")
-ENDIF()
\ No newline at end of file
+  SET(EXTRA_SRC ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbjtie/ndbjtie_lib.cpp)
+ENDIF()
+
+
+MESSAGE(STATUS "NDBCLIENT_SO_LIBS: ${NDBCLIENT_SO_LIBS}")
+ADD_LIBRARY(ndbclient_so SHARED ${EXTRA_SRC})
+TARGET_LINK_LIBRARIES(ndbclient_so ${NDBCLIENT_SO_LIBS})
+SET_TARGET_PROPERTIES(ndbclient_so PROPERTIES OUTPUT_NAME "ndbclient")

No bundle (reason: useless for push emails).