bugfix: don't overwrite tokudb.cnf during the build

MariaDB · Sep 18, 2017 · 79ddd86 · 79ddd86
1 parent bba169b
commit 79ddd86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
@@ -235,9 +235,11 @@ MACRO(MYSQL_ADD_PLUGIN)
         SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE)
         SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE)
         SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} PARENT_SCOPE)
-        IF(NOT ARG_CLIENT AND NOT ARG_CONFIG AND UNIX)
-          SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${target}.cnf")
-          FILE(WRITE ${ARG_CONFIG} "[mariadb]\nplugin-load-add=${ARG_MODULE_OUTPUT_NAME}.so\n")
+        IF(NOT ARG_CLIENT AND UNIX)
+          IF (NOT ARG_CONFIG)
+            SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${target}.cnf")
+            FILE(WRITE ${ARG_CONFIG} "[mariadb]\nplugin-load-add=${ARG_MODULE_OUTPUT_NAME}.so\n")
+          ENDIF()
           INSTALL(FILES ${ARG_CONFIG} COMPONENT ${ARG_COMPONENT} DESTINATION ${INSTALL_SYSCONF2DIR})
           SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" PARENT_SCOPE)
         ENDIF()

diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt
@@ -24,7 +24,7 @@ SET(TOKUDB_SOURCES
     tokudb_thread.cc
     tokudb_dir_cmd.cc)
 MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
-                 COMPONENT tokudb-engine)
+                 COMPONENT tokudb-engine CONFIG tokudb.cnf)
 
 IF(NOT TARGET tokudb)
   RETURN()
@@ -111,8 +111,3 @@ TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
 
 SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
 SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
-
-IF (INSTALL_SYSCONF2DIR)
-  INSTALL(FILES tokudb.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
-          COMPONENT tokudb-engine)
-ENDIF(INSTALL_SYSCONF2DIR)