List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:November 16 2010 9:05am
Subject:bzr commit into mysql-5.5 branch (magnus.blaudd:3090) Bug#58158
View as plain text  
#At file:///home/msvensson/mysql/5.5-bug58158/ based on revid:sunanda.menon@strippeda

 3090 Magnus Blåudd	2010-11-16
      Bug#58158 LINK_LIBRARIES for MYSQL_ADD_PLUGIN is not added to libmysqld
        - Add ARG_LINK_LIBRARIES to MYSQLD_STATIC_PLUGIN_LIBS in
          MYSQL_ADD_PLUGIN so that any libraries listed by the plugin is
          added to libmysqld
        - remove the variables NDB_CLIENT_LIBS and NDB_CLUSTER_INCLUDES
          from libmysqld/CMakeLists.txt since those are just old remnants

    modified:
      cmake/plugin.cmake
      libmysqld/CMakeLists.txt
=== modified file 'cmake/plugin.cmake'
--- a/cmake/plugin.cmake	2010-09-29 09:42:35 +0000
+++ b/cmake/plugin.cmake	2010-11-16 09:05:54 +0000
@@ -123,7 +123,7 @@ MACRO(MYSQL_ADD_PLUGIN)
 
     # Update mysqld dependencies
     SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS} 
-      ${target} CACHE INTERNAL "" FORCE)
+      ${target} ${ARG_LINK_LIBRARIES} CACHE INTERNAL "" FORCE)
 
     IF(ARG_MANDATORY)
       SET(${with_var} ON CACHE INTERNAL "Link ${plugin} statically to the server" 

=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2010-09-20 14:17:32 +0000
+++ b/libmysqld/CMakeLists.txt	2010-11-16 09:05:54 +0000
@@ -26,7 +26,6 @@ ${CMAKE_SOURCE_DIR}/regex
 ${ZLIB_INCLUDE_DIR}
 ${SSL_INCLUDE_DIRS}
 ${SSL_INTERNAL_INCLUDE_DIRS}
-${NDB_CLUSTER_INCLUDES}
 ${CMAKE_SOURCE_DIR}/sql/backup
 )
 
@@ -110,7 +109,7 @@ SET(LIBS 
   dbug strings regex mysys vio 
   ${ZLIB_LIBRARY} ${SSL_LIBRARIES} 
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
-  ${MYSQLD_STATIC_PLUGIN_LIBS} ${NDB_CLIENT_LIBS}
+  ${MYSQLD_STATIC_PLUGIN_LIBS}
   sql_embedded
 )
 

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20101116090554-noegxp3bpamy6rud.bundle
Thread
bzr commit into mysql-5.5 branch (magnus.blaudd:3090) Bug#58158Magnus Blåudd16 Nov