summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-11-30 15:27:08 +0100
committerSergei Golubchik <serg@mariadb.org>2021-01-12 16:47:23 +0100
commit81cb3e7934cb0f9df4ff788772fbb80d6d638c03 (patch)
tree26d427e4b77348d12d0c08502f8683bb16e8ca9e
parentfbc171333eafea102a42622e1cf028e85f6e1b12 (diff)
downloadmariadb-git-81cb3e7934cb0f9df4ff788772fbb80d6d638c03.tar.gz
MDEV-24292 support semi-independent versioning for sub-packages
4. update columnstore
-rw-r--r--storage/columnstore/CMakeLists.txt1
m---------storage/columnstore/columnstore0
2 files changed, 1 insertions, 0 deletions
diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt
index 77ba817c837..6a6d91b18fe 100644
--- a/storage/columnstore/CMakeLists.txt
+++ b/storage/columnstore/CMakeLists.txt
@@ -27,6 +27,7 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/preInstall_storage_engine.sh PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/postInstall_storage_engine.sh PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/columnstore/build/preUn_storage_engine.sh PARENT_SCOPE)
+ APPEND_FOR_CPACK(CPACK_RPM_columnstore-engine_PACKAGE_VERSION "")
ENDIF()
INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/columnstore")
ENDIF()
diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore
-Subproject 8d1fb3ed2f1a62805cfbf09ff110e66d6619e8e
+Subproject ea708da6e30fd579c5fb4b6cecb3c06d4649418