diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-05-27 17:09:09 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-05-27 17:09:09 +0300 |
| commit | f1463061b281916d81e5a2838101df88bf550df2 (patch) | |
| tree | 9a99bd03c8fb307d589f19a397f90d1153363d54 | |
| parent | f54beb2dccb921296a4c0bec1aa45e5dd6e53a69 (diff) | |
| parent | f82b2851c3d8d567b5973614a489a0b1d68fa400 (diff) | |
| download | mariadb-git-f1463061b281916d81e5a2838101df88bf550df2.tar.gz | |
automerge
| -rwxr-xr-x | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | include/config-win.h | 4 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 2 | ||||
| -rwxr-xr-x | win/configure.js | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f66453ef492..91c3a804eea 100755 --- a/CMakeLists.txt +++ b/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) diff --git a/include/config-win.h b/include/config-win.h index b9519e0f2a9..ab463a7c142 100644 --- a/include/config-win.h +++ b/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)) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index fa3c3a8b4ce..584c0abc777 100644 --- a/support-files/mysql.spec.sh +++ 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 diff --git a/win/configure.js b/win/configure.js index 0de09fb318c..8370497ea4b 100755 --- a/win/configure.js +++ b/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": |