database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Dynamic version numbering

Browse Source
This commit is contained in:
Roman Nozdrin
2020-12-08 14:51:40 +00:00
parent ab1d26127f
commit abbe2ebbf6
4 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dbcon/mysql/CMakeLists.txt
View File

@ -31,8 +31,6 @@ SET ( libcalmysql_SRCS
is_columnstore_files.cpp is_columnstore_files.cpp
is_columnstore_extents.cpp) is_columnstore_extents.cpp)
add_definitions(-DMYSQL_DYNAMIC_PLUGIN)
set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-templates") set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-templates")
if (COMMAND mysql_add_plugin) if (COMMAND mysql_add_plugin)
@ -40,17 +38,16 @@ if (COMMAND mysql_add_plugin)
SET(disabled DISABLED) SET(disabled DISABLED)
ENDIF() ENDIF()
FILE(COPY columnstore.cnf DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/)
SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf")
mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled} mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled}
LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool
COMPONENT columnstore-engine CONFIG ${CS_CNF_FILE}) VERSION ${PACKAGE_VERSION}
COMPONENT columnstore-engine CONFIG columnstore.cnf)
else () else ()
add_library(ha_columnstore SHARED ${libcalmysql_SRCS}) add_library(ha_columnstore SHARED ${libcalmysql_SRCS})
SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "")
add_dependencies(ha_columnstore loggingcpp) add_dependencies(ha_columnstore loggingcpp)
add_definitions(-DMYSQL_DYNAMIC_PLUGIN -DPLUGIN_COLUMNSTORE_VERSION="${PACKAGE_VERSION}")
target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool) target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)

10
dbcon/mysql/ha_mcs.cpp
View File

@ -1920,7 +1920,7 @@ maria_declare_plugin(columnstore)
MCSVERSIONHEX, MCSVERSIONHEX,
mcs_status_variables, /* status variables */ mcs_status_variables, /* status variables */
mcs_system_variables, /* system variables */ mcs_system_variables, /* system variables */
MCSVERSION, /* string version */ PLUGIN_COLUMNSTORE_VERSION, /* string version */
COLUMNSTORE_MATURITY /* maturity */ COLUMNSTORE_MATURITY /* maturity */
}, },
{ {
@ -1936,7 +1936,7 @@ maria_declare_plugin(columnstore)
MCSVERSIONHEX, MCSVERSIONHEX,
NULL, NULL,
NULL, NULL,
MCSVERSION, PLUGIN_COLUMNSTORE_VERSION,
COLUMNSTORE_MATURITY COLUMNSTORE_MATURITY
}, },
{ {
@ -1952,7 +1952,7 @@ maria_declare_plugin(columnstore)
MCSVERSIONHEX, MCSVERSIONHEX,
NULL, NULL,
NULL, NULL,
MCSVERSION, PLUGIN_COLUMNSTORE_VERSION,
COLUMNSTORE_MATURITY COLUMNSTORE_MATURITY
}, },
{ {
@ -1968,7 +1968,7 @@ maria_declare_plugin(columnstore)
MCSVERSIONHEX, MCSVERSIONHEX,
NULL, NULL,
NULL, NULL,
MCSVERSION, PLUGIN_COLUMNSTORE_VERSION,
COLUMNSTORE_MATURITY COLUMNSTORE_MATURITY
}, },
{ {
@ -1984,7 +1984,7 @@ maria_declare_plugin(columnstore)
MCSVERSIONHEX, MCSVERSIONHEX,
NULL, NULL,
NULL, NULL,
MCSVERSION, PLUGIN_COLUMNSTORE_VERSION,
COLUMNSTORE_MATURITY COLUMNSTORE_MATURITY
} }
maria_declare_plugin_end; maria_declare_plugin_end;

1
dbcon/mysql/ha_mcs_version.h.in
View File

@ -17,5 +17,4 @@
#pragma once #pragma once
#define MCSVERSION "${PACKAGE_VERSION}"
#define MCSVERSIONHEX ${MCSVERSIONHEX} #define MCSVERSIONHEX ${MCSVERSIONHEX}

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Architecture: amd64
Depends: binutils, Depends: binutils,
libjemalloc1 | libjemalloc2, libjemalloc1 | libjemalloc2,
libsnappy1 | libsnappy1v5, libsnappy1 | libsnappy1v5,
mariadb-server-10.6 (= ${binary:Version}), mariadb-server-10.6 (= ${server:Version}),
net-tools, net-tools,
python3, python3,
${misc:Depends}, ${misc:Depends},