bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4353)

[Magnus Blåudd]

#At file:///C:/mysql/7.0/ based on revid:[e-mail]-20110503092034-as8186ftanjrntqg

 4353 Magnus Blåudd	2011-05-03
      ndb
       - set NDB to be a mandatory plugin in MySQL Cluster and not default in vanilla MySQL Server

    modified:
      storage/ndb/CMakeLists.txt
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2011-05-03 09:20:34 +0000
+++ b/storage/ndb/CMakeLists.txt	2011-05-03 09:37:35 +0000
@@ -154,8 +154,16 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/storage/my
   MYSQL_STORAGE_ENGINE(NDBCLUSTER)
 ELSE()
   # New plugin support, cross-platform
+  
+  # NDB is MANDATORY plugin in MySQL Cluster i.e it's always built
+  SET(is_mandatory_plugin "")
+  IF(MYSQL_CLUSTER_VERSION)
+    SET(is_mandatory_plugin "MANDATORY")
+  ENDIF()
+
   MYSQL_ADD_PLUGIN(ndbcluster ${NDBCLUSTER_SOURCES} STORAGE_ENGINE
-    DEFAULT STATIC_ONLY RECOMPILE_FOR_EMBEDDED LINK_LIBRARIES ndbclient)
+    ${is_mandatory_plugin} STATIC_ONLY RECOMPILE_FOR_EMBEDDED
+    LINK_LIBRARIES ndbclient)
 
   IF (NOT MCP_BUG58158)
     IF(WITH_EMBEDDED_SERVER)

Attachment: [text/bzr-bundle] bzr/[e-mail]