summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-12-07 11:40:38 +0000
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-12-07 11:40:38 +0000
commit5046dc160b5112d065a3b513dd90f4c1d5510807 (patch)
treec3879f6124c8ff367aab5ae4f706696af0ac2b24 /cmake
parent1ce79dcfddd2adee692cb4677e441251f59a3037 (diff)
downloadmariadb-git-5046dc160b5112d065a3b513dd90f4c1d5510807.tar.gz
bug#58766: Server binary was compiled without fast-mutexes
Re-enable fast mutexes on Linux for release builds.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/build_configurations/mysql_release.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 56a6d897318..1838b0bb669 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -117,8 +117,8 @@ IF(UNIX)
OPTION(WITH_PIC "" ON) # Why?
- # Ensure aio is available on Linux (required by InnoDB)
IF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ # Ensure aio is available on Linux (required by InnoDB)
CHECK_INCLUDE_FILES(libaio.h HAVE_LIBAIO_H)
CHECK_LIBRARY_EXISTS(aio io_queue_init "" HAVE_LIBAIO)
IF(NOT HAVE_LIBAIO_H OR NOT HAVE_LIBAIO)
@@ -130,6 +130,9 @@ IF(UNIX)
SuSE: zypper install libaio-devel
")
ENDIF()
+
+ # Enable fast mutexes on Linux
+ OPTION(WITH_FAST_MUTEXES "" ON)
ENDIF()
ENDIF()