From abbe2ebbf684952d0cd1b6678d6badae63abedc7 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Tue, 8 Dec 2020 14:51:40 +0000
Subject: [PATCH] Dynamic version numbering

---
 dbcon/mysql/CMakeLists.txt      |  9 +++------
 dbcon/mysql/ha_mcs.cpp          | 10 +++++-----
 dbcon/mysql/ha_mcs_version.h.in |  1 -
 debian/control                  |  2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index 7274ed525..bda7fe263 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -31,8 +31,6 @@ SET ( libcalmysql_SRCS
     is_columnstore_files.cpp
     is_columnstore_extents.cpp)
 
-add_definitions(-DMYSQL_DYNAMIC_PLUGIN)
-
 set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-templates")
 
 if (COMMAND mysql_add_plugin)
@@ -40,17 +38,16 @@ if (COMMAND mysql_add_plugin)
     SET(disabled DISABLED)
   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}
       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 ()
     add_library(ha_columnstore SHARED ${libcalmysql_SRCS})
     SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "")
 
     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)
 
diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp
index af73421b1..199886d14 100644
--- a/dbcon/mysql/ha_mcs.cpp
+++ b/dbcon/mysql/ha_mcs.cpp
@@ -1920,7 +1920,7 @@ maria_declare_plugin(columnstore)
   MCSVERSIONHEX,
   mcs_status_variables,          /* status variables */
   mcs_system_variables,          /* system variables */
-  MCSVERSION,                    /* string version */
+  PLUGIN_COLUMNSTORE_VERSION,    /* string version */
   COLUMNSTORE_MATURITY           /* maturity */
 },
 {
@@ -1936,7 +1936,7 @@ maria_declare_plugin(columnstore)
     MCSVERSIONHEX,
     NULL,
     NULL,
-    MCSVERSION,
+    PLUGIN_COLUMNSTORE_VERSION,
     COLUMNSTORE_MATURITY
 },
 {
@@ -1952,7 +1952,7 @@ maria_declare_plugin(columnstore)
     MCSVERSIONHEX,
     NULL,
     NULL,
-    MCSVERSION,
+    PLUGIN_COLUMNSTORE_VERSION,
     COLUMNSTORE_MATURITY
 },
 {
@@ -1968,7 +1968,7 @@ maria_declare_plugin(columnstore)
     MCSVERSIONHEX,
     NULL,
     NULL,
-    MCSVERSION,
+    PLUGIN_COLUMNSTORE_VERSION,
     COLUMNSTORE_MATURITY
 },
 {
@@ -1984,7 +1984,7 @@ maria_declare_plugin(columnstore)
     MCSVERSIONHEX,
     NULL,
     NULL,
-    MCSVERSION,
+    PLUGIN_COLUMNSTORE_VERSION,
     COLUMNSTORE_MATURITY
 }
 maria_declare_plugin_end;
diff --git a/dbcon/mysql/ha_mcs_version.h.in b/dbcon/mysql/ha_mcs_version.h.in
index 23e7f5325..2388d78cb 100644
--- a/dbcon/mysql/ha_mcs_version.h.in
+++ b/dbcon/mysql/ha_mcs_version.h.in
@@ -17,5 +17,4 @@
 
 #pragma once
 
-#define MCSVERSION "${PACKAGE_VERSION}"
 #define MCSVERSIONHEX ${MCSVERSIONHEX}
diff --git a/debian/control b/debian/control
index 7567ec05d..bd38d82ea 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Architecture: amd64
 Depends: binutils,
          libjemalloc1 | libjemalloc2,
          libsnappy1 | libsnappy1v5,
-         mariadb-server-10.6 (= ${binary:Version}),
+         mariadb-server-10.6 (= ${server:Version}),
          net-tools,
          python3,
          ${misc:Depends},