Skip to content

M
MariaDB
Commit aa9a42d6 authored by Roman Nozdrin's avatar Roman Nozdrin Committed by Oleksandr Byelkin
Browse files
Options

Change the method to run SQL statements installing MCS to fix major update scenario. 

Added binutils dependency.
parent 1e7a68f8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
debian/control
View file @ aa9a42d6
...@@ -655,6 +655,7 @@ Package: mariadb-plugin-columnstore ...@@ -655,6 +655,7 @@ Package: mariadb-plugin-columnstore
Architecture: amd64 i386 Architecture: amd64 i386
Depends: mariadb-server-10.5 (= ${binary:Version}), Depends: mariadb-server-10.5 (= ${binary:Version}),
net-tools, net-tools,
binutils,
libsnappy1 | libsnappy1v5, libsnappy1 | libsnappy1v5,
libjemalloc1 | libjemalloc2, libjemalloc1 | libjemalloc2,
python | python2 | python3, python | python2 | python3,
......
storage/columnstore/CMakeLists.txt
View file @ aa9a42d6
...@@ -18,11 +18,11 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "i686") ...@@ -18,11 +18,11 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE)
# To untie the python mess across distributions MCS supports. # To untie the python mess across distributions MCS supports.
IF(RPM MATCHES "(rhel|centos)8|(sles|suse)15|fedora") IF(RPM MATCHES "(rhel|centos)8|(sles|suse)15|fedora")
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python3" PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python3, binutils" PARENT_SCOPE)
ELSEIF(RPM MATCHES "(centos|rhel)7") ELSEIF(RPM MATCHES "(centos|rhel)7")
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python" PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python, binutils" PARENT_SCOPE)
ELSE() ELSE()
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python or python2 or python3" PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python or python2 or python3, binutils" PARENT_SCOPE)
ENDIF() ENDIF()
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE} PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE} PARENT_SCOPE) SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
......
columnstore @ aa3af826
Subproject commit 0cd56e7d01ec952fbe05f2c462cc59a80b88a309 Subproject commit aa3af8262028262a3c3f877039ef6f073517aa35
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7