automerge

CMakeLists.txt

@@ -32,6 +32,10 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS")
 
 # Note that some engines are always compiled in, MyISAM, MyISAMMRG, HEAP
 
+IF(WITH_COMMUNITY_FEATURES)
+  ADD_DEFINITIONS(-DENABLED_PROFILING -DCOMMUNITY_SERVER)
+ENDIF(WITH_COMMUNITY_FEATURES)
+
 IF(WITH_ARCHIVE_STORAGE_ENGINE)
   ADD_DEFINITIONS(-DHAVE_ARCHIVE_DB)
 ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)

include/config-win.h

@@ -206,10 +206,6 @@ typedef uint rf_SetTimer;
 /* If LOAD DATA LOCAL INFILE should be enabled by default */
 #define ENABLED_LOCAL_INFILE 1
 
-/* If query profiling should be enabled by default */
-#define ENABLED_PROFILING 1
-#define COMMUNITY_SERVER 1
-
 /* Convert some simple functions to Posix */
 
 #define my_sigset(A,B) signal((A),(B))

support-files/mysql.spec.sh

@@ -264,6 +264,8 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
             --includedir=%{_includedir} \
             --mandir=%{_mandir} \
 	    --enable-thread-safe-client \
+	    --enable-community-features \
+            --enable-profiling \
 	    --with-readline ; \
 	    # Add this for more debugging support
 	    # --with-debug

win/configure.js

@@ -39,6 +39,7 @@ try
         var parts = args.Item(i).split('=');
         switch (parts[0])
         {
+            case "WITH_COMMUNITY_FEATURES":
             case "WITH_ARCHIVE_STORAGE_ENGINE":
             case "WITH_BERKELEY_STORAGE_ENGINE":
             case "WITH_BLACKHOLE_STORAGE_ENGINE":