bzr commit into mysql-5.5-bugteam branch (magnus.blaudd:3137)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-bugteam/ based on revid:magnus.blaudd@stripped

 3137 Magnus Blåudd	2010-11-24 [merge]
      Merge 5.5-bug58158 into 5.5-bugteam

    modified:
      cmake/plugin.cmake
      libmysqld/CMakeLists.txt
=== modified file 'cmake/plugin.cmake'
--- a/cmake/plugin.cmake	2010-11-12 12:42:50 +0000
+++ b/cmake/plugin.cmake	2010-11-24 10:33:49 +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
 )
 

No bundle (reason: revision is a merge).