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 | 6ad007c7adeafe9f765e67fda27fa6b3a33c9488 (patch) | |
| tree | be083f6c112f9a0e9d2ea405d1e1792d54878c7b /libmysqld | |
| parent | 41cab3211134e7d9ee46f261695f727089884f98 (diff) | |
| parent | 31e30ee326f07c62895f63ea292859b1d95d32e2 (diff) | |
| download | mariadb-git-6ad007c7adeafe9f765e67fda27fa6b3a33c9488.tar.gz | |
Merge 5.5-bug58158 into 5.5-bugteam
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
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 ) |