1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

Merge pull request #1480 from dhall-MariaDB/MCOL-4329-dev

MCOL-4329 dev set plugin-maturity to stable
This commit is contained in:
Roman Nozdrin
2020-10-27 18:07:22 +03:00
committed by GitHub
3 changed files with 8 additions and 16 deletions

View File

@ -40,12 +40,7 @@ if (COMMAND mysql_add_plugin)
ENDIF()
FILE(COPY columnstore.cnf DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/)
if (BUILD_CONFIG STREQUAL "enterprise")
FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/x-columnstore.cnf)
SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/x-columnstore.cnf")
else ()
SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf")
endif ()
SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf")
mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled}
LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool
@ -62,15 +57,7 @@ else ()
# define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist)
add_custom_target(columnstore DEPENDS ha_columnstore)
if(BUILD_CONFIG STREQUAL "enterprise")
message(STATUS "enterprise build: columnstore.cnf renamed to x-columnstore.cnf on install")
install(FILES columnstore.cnf
RENAME x-columnstore.cnf
DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
else()
install(FILES columnstore.cnf
DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
endif()
install(FILES columnstore.cnf DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
endif ()
if (TARGET columnstore)

View File

@ -1,6 +1,5 @@
[mysqld]
plugin-load-add=ha_columnstore.so
plugin-maturity=beta
# Enable compression by default on create, set to NONE to turn off
#columnstore_compression_type=SNAPPY