Commit 37b1b065 authored by Sergei Golubchik's avatar Sergei Golubchik

TokuDB: generate tokudb.cnf unconditionally

it's listed in MYSQL_ADD_PLUGIN() declaration,
so it must always exist, jemalloc or not.
parent c5bb6024
...@@ -78,7 +78,6 @@ ELSEIF(LIBJEMALLOC STREQUAL jemalloc) ...@@ -78,7 +78,6 @@ ELSEIF(LIBJEMALLOC STREQUAL jemalloc)
IF(INSTALL_SYSCONFDIR) IF(INSTALL_SYSCONFDIR)
SET(systemd_env "Environment=\"LD_PRELOAD=${LIBJEMALLOC_PATH}\"") SET(systemd_env "Environment=\"LD_PRELOAD=${LIBJEMALLOC_PATH}\"")
SET(cnf_malloc_lib "malloc-lib=${LIBJEMALLOC_PATH}") SET(cnf_malloc_lib "malloc-lib=${LIBJEMALLOC_PATH}")
CONFIGURE_FILE(tokudb.cnf.in tokudb.cnf @ONLY)
CONFIGURE_FILE(tokudb.conf.in tokudb.conf @ONLY) CONFIGURE_FILE(tokudb.conf.in tokudb.conf @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tokudb.conf INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tokudb.conf
DESTINATION ${INSTALL_SYSCONFDIR}/systemd/system/mariadb.service.d/ DESTINATION ${INSTALL_SYSCONFDIR}/systemd/system/mariadb.service.d/
...@@ -86,6 +85,8 @@ ELSEIF(LIBJEMALLOC STREQUAL jemalloc) ...@@ -86,6 +85,8 @@ ELSEIF(LIBJEMALLOC STREQUAL jemalloc)
ENDIF() ENDIF()
ENDIF() ENDIF()
CONFIGURE_FILE(tokudb.cnf.in tokudb.cnf @ONLY)
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-shadow") MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-shadow")
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla" DEBUG) MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-vla" DEBUG)
MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-implicit-fallthrough") MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-implicit-fallthrough")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment