diff options
| author | Daniel Black <daniel.black@au.ibm.com> | 2016-09-20 10:05:10 +1000 |
|---|---|---|
| committer | Daniel Black <daniel.black@au.ibm.com> | 2016-09-23 08:33:38 +1000 |
| commit | 8103f6f2235b58ca09f75efe24d2731895387152 (patch) | |
| tree | 8fa176d600c9241b1c9964f7d0059b6df7620f3c /storage/xtradb | |
| parent | 26e3117ca9f02cf3dcb424b82e93be8709cc5e91 (diff) | |
| download | mariadb-git-8103f6f2235b58ca09f75efe24d2731895387152.tar.gz | |
MDEV-10829: Enable Innodb NUMA interleave
Code was already existing within the innobase/xtradb storage engines
however without this cmake code it was never enabled.
num.cmake heavily based off work by Annamalai Gurusami <annamalai.gurusami@oracle.com>
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt index 7d2a3fad56d..51e24b3cd8a 100644 --- a/storage/xtradb/CMakeLists.txt +++ b/storage/xtradb/CMakeLists.txt @@ -29,6 +29,7 @@ MYSQL_CHECK_LZO() MYSQL_CHECK_LZMA() MYSQL_CHECK_BZIP2() MYSQL_CHECK_SNAPPY() +MYSQL_CHECK_NUMA() IF(CMAKE_CROSSCOMPILING) # Use CHECK_C_SOURCE_COMPILES instead of CHECK_C_SOURCE_RUNS when @@ -496,9 +497,18 @@ SET(INNOBASE_SOURCES ut/ut0wqueue.cc ut/ut0timer.cc) +UNSET(NUMA_LIBRARY) +IF(HAVE_LIBNUMA) + SET(NUMA_LIBRARY "numa") +ENDIF() + MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE DEFAULT RECOMPILE_FOR_EMBEDDED - LINK_LIBRARIES ${ZLIB_LIBRARY} ${CRC32_VPMSUM_LIBRARY} ${LINKER_SCRIPT}) + LINK_LIBRARIES + ${ZLIB_LIBRARY} + ${CRC32_VPMSUM_LIBRARY} + ${NUMA_LIBRARY} + ${LINKER_SCRIPT}) IF(TARGET xtradb AND NOT XTRADB_OK) MESSAGE(FATAL_ERROR "Percona XtraDB is not supported on this platform") |