Skip to content

Commit aa9a42d

Browse files
drrtuysanja-byelkin
authored andcommitted
Change the method to run SQL statements installing MCS to fix major update scenario.
Added binutils dependency.
1 parent 1e7a68f commit aa9a42d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

debian/control

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@ Package: mariadb-plugin-columnstore
655655
Architecture: amd64 i386
656656
Depends: mariadb-server-10.5 (= ${binary:Version}),
657657
net-tools,
658+
binutils,
658659
libsnappy1 | libsnappy1v5,
659660
libjemalloc1 | libjemalloc2,
660661
python | python2 | python3,

storage/columnstore/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
1818
SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE)
1919
# To untie the python mess across distributions MCS supports.
2020
IF(RPM MATCHES "(rhel|centos)8|(sles|suse)15|fedora")
21-
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python3" PARENT_SCOPE)
21+
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python3, binutils" PARENT_SCOPE)
2222
ELSEIF(RPM MATCHES "(centos|rhel)7")
23-
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python" PARENT_SCOPE)
23+
SET(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES "${CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES}, MariaDB-server >= 10.5.4, python, binutils" PARENT_SCOPE)
2424
ELSE()
25-
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)
25+
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)
2626
ENDIF()
2727
SET(CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_PRE_INSTALL_SCRIPT_FILE} PARENT_SCOPE)
2828
SET(CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE ${CPACK_RPM_columnstore-engine_POST_INSTALL_SCRIPT_FILE} PARENT_SCOPE)

0 commit comments

Comments
 (0)