diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-04 08:24:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-04 08:24:57 +0300 |
| commit | a5da1c64f8d96278c8e4408458f7e8d4b6dea415 (patch) | |
| tree | e852956c3d812eb546fb049bf745350bd47343ee /CMakeLists.txt | |
| parent | 12ed50cc8d20cc09e302e5dad9ed6a4a6d4ca222 (diff) | |
| parent | bc2501453c3ab9a2cf3516bc3557de8665bc2776 (diff) | |
| download | mariadb-git-a5da1c64f8d96278c8e4408458f7e8d4b6dea415.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0813cf2288f..94362c349f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,12 +248,6 @@ MY_CHECK_AND_SET_COMPILER_FLAG(-ggdb3 DEBUG) OPTION(ENABLED_LOCAL_INFILE "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN}) -OPTION(WITH_INNODB_DISALLOW_WRITES "InnoDB freeze writes patch from Google" ${WITH_WSREP}) -IF (WITH_INNODB_DISALLOW_WRITES) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWITH_INNODB_DISALLOW_WRITES") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWITH_INNODB_DISALLOW_WRITES") -ENDIF() - # Set DBUG_OFF and other optional release-only flags for non-debug project types FOREACH(BUILD_TYPE RELEASE RELWITHDEBINFO MINSIZEREL) FOREACH(LANG C CXX) @@ -267,7 +261,7 @@ ENDFOREACH() # Add safemutex for debug configurations, except on Windows # (safemutex has never worked on Windows) -IF(NOT WIN32 AND NOT WITH_INNODB_MEMCACHED) +IF(NOT WIN32) FOREACH(LANG C CXX) SET(CMAKE_${LANG}_FLAGS_DEBUG "${CMAKE_${LANG}_FLAGS_DEBUG} -DSAFE_MUTEX") ENDFOREACH() |