diff options
| author | Roman Nozdrin <roman.nozdrin@mariadb.com> | 2020-06-18 15:32:46 +0000 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-06-19 11:17:42 +0200 |
| commit | 5c09de041755824400de2f23662d1c59f7e8f4c2 (patch) | |
| tree | 5701b06077783195fb07ae733f75df94d25838af | |
| parent | 38cb9711aaa204dbb16fb08e48e57939d08271eb (diff) | |
| download | mariadb-git-5c09de041755824400de2f23662d1c59f7e8f4c2.tar.gz | |
Change the method to run SQL statements installing MCS to fix major update scenario.
Added binutils dependency.
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | storage/columnstore/CMakeLists.txt | 6 | ||||
| m--------- | storage/columnstore/columnstore | 0 |
3 files changed, 4 insertions, 3 deletions
diff --git a/debian/control b/debian/control index 8f5b12006f7..4a84fad3bba 100644 --- a/debian/control +++ b/debian/control @@ -646,6 +646,7 @@ Package: mariadb-plugin-columnstore Architecture: amd64 i386 Depends: mariadb-server-10.5 (= ${binary:Version}), net-tools, + binutils, libsnappy1 | libsnappy1v5, libjemalloc1 | libjemalloc2, python | python2 | python3, diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt index f688c3040d4..0661b6b5138 100644 --- a/storage/columnstore/CMakeLists.txt +++ b/storage/columnstore/CMakeLists.txt @@ -18,11 +18,11 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "i686") SET(CPACK_RPM_columnstore-engine_USER_FILELIST ${CPACK_RPM_columnstore-engine_USER_FILELIST} PARENT_SCOPE) # To untie the python mess across distributions MCS supports. 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") - 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() - 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() 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) diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore -Subproject 0cd56e7d01ec952fbe05f2c462cc59a80b88a30 +Subproject aa3af8262028262a3c3f877039ef6f073517aa3 |