diff options
| author | Magnus Blåudd <magnus.blaudd@sun.com> | 2010-11-24 11:49:10 +0100 |
|---|---|---|
| committer | Magnus Blåudd <magnus.blaudd@sun.com> | 2010-11-24 11:49:10 +0100 |
| commit | b3f9f0c38876b0ea77372e7f20d8330d3ce7ef1e (patch) | |
| tree | be083f6c112f9a0e9d2ea405d1e1792d54878c7b | |
| parent | f9c3be71d1f8bf543f135719f6c15d095b574e84 (diff) | |
| parent | fb140a87d3e32de982e1a1d5c6816dda34954cac (diff) | |
| download | mariadb-git-b3f9f0c38876b0ea77372e7f20d8330d3ce7ef1e.tar.gz | |
Merge 5.5-bug58158 into 5.5-bugteam
| -rw-r--r-- | cmake/plugin.cmake | 2 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index bf34407db25..c6dd3fc451f 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -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" diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 545d03532c1..25f4b752a30 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -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 ) |