diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-11-29 12:06:48 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-11-29 12:06:48 +0400 |
| commit | 5b697c5a23ed7322b5b746b61e3ec66b510ca134 (patch) | |
| tree | 22f086fad2685d1a45b8531f96f30ed7fabb7554 /cmake | |
| parent | e01d33d773abbffad0ea1739f0e04816eecce89d (diff) | |
| parent | b65fd73bb19578148e41d788504ae18812c2cb43 (diff) | |
| download | mariadb-git-5b697c5a23ed7322b5b746b61e3ec66b510ca134.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/dtrace.cmake | 3 | ||||
| -rw-r--r-- | cmake/wsrep.cmake | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmake/dtrace.cmake b/cmake/dtrace.cmake index 3edcdc4c1c5..d7ab0f31991 100644 --- a/cmake/dtrace.cmake +++ b/cmake/dtrace.cmake @@ -42,7 +42,8 @@ MACRO(CHECK_DTRACE) # On FreeBSD, dtrace does not handle userland tracing yet IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND NOT BUGGY_GCC_NO_DTRACE_MODULES - AND NOT BUGGY_LINUX_DTRACE) + AND NOT BUGGY_LINUX_DTRACE + AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS") SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace") ENDIF() SET(HAVE_DTRACE ${ENABLE_DTRACE}) diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake index e6d1379aea3..b5dc8b9f157 100644 --- a/cmake/wsrep.cmake +++ b/cmake/wsrep.cmake @@ -26,7 +26,7 @@ ENDIF() OPTION(WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)" ${with_wsrep_default}) # Set the patch version -SET(WSREP_PATCH_VERSION "20") +SET(WSREP_PATCH_VERSION "21") # Obtain wsrep API version FILE(STRINGS "${MySQL_SOURCE_DIR}/wsrep/wsrep_api.h" WSREP_API_VERSION |