diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-03-11 20:00:08 +0000 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-03-11 20:00:08 +0000 |
| commit | 5c1c2f67ec9373f55f9b69bdaf4adad416e4788b (patch) | |
| tree | 00aaae6bea75bbdb9104d9e0588ab8f4896eecaf /storage/rocksdb/CMakeLists.txt | |
| parent | fd39f25ca70d548a4ec1ed36c4c6c30072d4e47b (diff) | |
| parent | 65d01da29c03c44f3c059a999c7c1cc6e001ead8 (diff) | |
| download | mariadb-git-5c1c2f67ec9373f55f9b69bdaf4adad416e4788b.tar.gz | |
Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-mariarocks
Manually resolved a few conflicts
Diffstat (limited to 'storage/rocksdb/CMakeLists.txt')
| -rw-r--r-- | storage/rocksdb/CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index 0c8025d3d18..f066bd48f9f 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -65,6 +65,8 @@ SET(ROCKSDB_SE_SOURCES rdb_utils.cc rdb_utils.h rdb_threads.cc rdb_threads.h + rdb_psi.h + rdb_psi.cc ) MYSQL_ADD_PLUGIN(rocksdb_se ${ROCKSDB_SE_SOURCES} STORAGE_ENGINE MODULE_OUTPUT_NAME ha_rocksdb) @@ -74,6 +76,12 @@ IF(NOT TARGET rocksdb_se) RETURN() ENDIF() +# MARIAROCKS-TODO: ??? +CHECK_FUNCTION_EXISTS(fallocate HAVE_FALLOCATE) +IF(HAVE_FALLOCATE) + ADD_DEFINITIONS(-DROCKSDB_FALLOCATE_PRESENT) +ENDIF() + INCLUDE(build_rocksdb.cmake) ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib @@ -89,7 +97,8 @@ ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib rdb_sst_info.cc rdb_sst_info.h rdb_buff.h - rdb_mariadb_port.h) + rdb_mariadb_port.h +) ADD_DEPENDENCIES(rocksdb_aux_lib GenError) |