Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
aa9a42d6
Commit
aa9a42d6
authored
Jun 18, 2020
by
Roman Nozdrin
Committed by
Oleksandr Byelkin
Jun 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change the method to run SQL statements installing MCS to fix major update scenario.
Added binutils dependency.
parent
1e7a68f8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
debian/control
debian/control
+1
-0
storage/columnstore/CMakeLists.txt
storage/columnstore/CMakeLists.txt
+3
-3
storage/columnstore/columnstore
storage/columnstore/columnstore
+1
-1
No files found.
debian/control
View file @
aa9a42d6
...
...
@@ -655,6 +655,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
,
...
...
storage/columnstore/CMakeLists.txt
View file @
aa9a42d6
...
...
@@ -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
)
...
...
columnstore
@
aa3af826
Subproject commit
0cd56e7d01ec952fbe05f2c462cc59a80b88a309
Subproject commit
aa3af8262028262a3c3f877039ef6f073517aa35
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment