summaryrefslogtreecommitdiff
path: root/extra/CMakeLists.txt
diff options
context:
space:
mode:
authorJan Lindström <jplindst@mariadb.org>2014-02-28 08:53:09 +0200
committerJan Lindström <jplindst@mariadb.org>2014-02-28 08:53:09 +0200
commitc88a0d48c6624466d058282bf7e2e8279660564e (patch)
tree96f0a63360e5d7b69920815c3e66b8a1b944c421 /extra/CMakeLists.txt
parentb620e7368f05af52f3fa1a759bc446140baf7b56 (diff)
downloadmariadb-git-c88a0d48c6624466d058282bf7e2e8279660564e.tar.gz
Temporal fix for flush thread hang.
Added option to disable multi-threaded flush with innodb_use_mtflush = 0 option, by default multi-threaded flush is used. Updated innochecksum tool, still it does not support new checksums.
Diffstat (limited to 'extra/CMakeLists.txt')
-rw-r--r--extra/CMakeLists.txt16
1 files changed, 15 insertions, 1 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index f8f71b00743..cf3a35cb1dd 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -72,10 +72,24 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
ENDIF()
ENDIF()
+IF(WITH_INNOBASE_STORAGE_ENGINE)
+ # Add path to the InnoDB headers
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include)
+ # We use the InnoDB code directly in case the code changes.
+ ADD_DEFINITIONS("-DUNIV_INNOCHECKSUM")
+ SET(INNOBASE_SOURCES
+ ../storage/innobase/buf/buf0checksum.cc
+ ../storage/innobase/ut/ut0crc32.cc
+ ../storage/innobase/ut/ut0ut.cc
+ )
+ MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
+ TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
+ENDIF()
+
MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
TARGET_LINK_LIBRARIES(replace mysys)
+
IF(UNIX)
- MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c)
MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)