List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:May 6 2011 1:27pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4361)
View as plain text  
#At file:///data0/magnus/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4361 Magnus Blåudd	2011-05-06
      ndb
       - change ndbcluster to be a DEFAULT plugin and not MANDATORY,
         since mandatory does not give a --ndbcluster switch.

    modified:
      storage/ndb/CMakeLists.txt
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2011-05-03 09:37:35 +0000
+++ b/storage/ndb/CMakeLists.txt	2011-05-06 13:26:05 +0000
@@ -155,14 +155,14 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/storage/my
 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()
+  # NDB is DEFAULT plugin in MySQL Cluster
+  SET(is_default_plugin "")
+  IF(MYSQL_CLUSTER_VERSION)
+    SET(is_default_plugin "DEFAULT")
+  ENDIF()
 
   MYSQL_ADD_PLUGIN(ndbcluster ${NDBCLUSTER_SOURCES} STORAGE_ENGINE
-    ${is_mandatory_plugin} STATIC_ONLY RECOMPILE_FOR_EMBEDDED
+    ${is_default_plugin} STATIC_ONLY RECOMPILE_FOR_EMBEDDED
     LINK_LIBRARIES ndbclient)
 
   IF (NOT MCP_BUG58158)

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110506132605-1gjxj59fg2uc6i7u.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4361) Magnus Blåudd6 May