Commit graph

64 commits

Author SHA1 Message Date
Yuchen Pei
60b93cdd30
Merge branch '10.5' into 10.6 2024-09-06 13:52:57 +10:00
Daniel Black
8024b8e4c1 MDEV-33091 pcre2 headers - handle columnstore
From e735cf2ed7cefb2af36f10f3cb47dfc060789df3, the PCRE_INCLUDES
changed to PCRE_INCLUDE_DIRS for consistency.

The columnstore module depends on the old name.

Create a mapping for the columnstore submodule.

10.6+ fix for submodule is:
* https://github.com/mariadb-corporation/mariadb-columnstore-engine/pull/3304
2024-09-05 12:14:06 +10:00
Sergei Golubchik
887bb3f735 columnstore 6.4.8-2 2024-05-09 00:04:20 +02:00
Oleksandr Byelkin
bda8d4fdf7 require boost 1.53 for columnstore 2024-04-28 18:09:13 +02:00
Sergei Golubchik
b3e29da540 MDEV-33290: Disable ColumnStore based on boost version (post-postfix)
policy CMP0093 was added in cmake 3.15
let's support cmake from 2.8.12, that's what our
CMAKE_MINIMUM_REQUIRED() says
2024-04-05 12:40:49 +02:00
Daniel Black
075dd73641 MDEV-33290: Disable ColumnStore based on boost version (postfix)
Its important to fail early and only contine with the include after
the boost version check succeeds.

Needs to succeed on ealier verisons too so can't just fail if too new.
As such, do a version check.
2024-04-05 12:40:49 +02:00
Sergei Golubchik
2278f3503e fix columnstore compilation on fc39 2024-01-31 22:02:59 +01:00
Sergei Golubchik
3f6038bc51 Merge branch '10.5' into 10.6 2024-01-31 18:04:03 +01:00
Daniel Black
5ce6a352b6 MDEV-33290: Disable ColumnStore based on boost version
MCOL-5611 supporting with Boost-1.80, the version "next_prime"
disappears from https://github.com/boostorg/unordered/blob/boost-1.79.0/include/boost/unordered/detail/implementation.hpp
makes it the currenly highest supported versions.

Lets check this version.

While CMake-3.19+ supports version ranges in package determinations this
isn't supported for Boost in Cmake-3.28. So we check for the 1.80 and
don't compile ColumnStore.
2024-01-23 15:20:25 +11:00
Sergei Golubchik
e95bba9c58 Merge branch '10.5' into 10.6 2023-12-17 11:20:43 +01:00
Oleksandr Byelkin
c3a5cf2b5b Merge branch '10.5' into 10.6 2023-01-31 09:31:42 +01:00
Sergei Golubchik
d157b250ff update colunmstore 2022-11-03 11:20:33 +01:00
Sergei Golubchik
b4a58581fd columnstore 5.6.8-1 2022-10-26 19:29:46 +02:00
Oleksandr Byelkin
44f2ece543 columnstore-6.4.6-1 2022-10-20 18:55:09 +02:00
Sergei Golubchik
4f54c219e7 update columnstore
fixes srpm builds on centos7 and other old platforms (with cmake < 3.1)
fixes pre-uninstall script
fixes parallel builds
2022-08-08 13:36:43 +02:00
Oleksandr Byelkin
ee620a7416 Merge branch '10.5' into 10.6 2022-08-04 16:58:42 +02:00
Oleksandr Byelkin
1e71ea806b Merge branch '10.4' into 10.5 2022-08-04 08:30:03 +02:00
Sergei Golubchik
a42e327afe columnstore-6.3.1-1 2022-04-30 15:21:59 +02:00
Sergei Golubchik
1421d1f296 columnstore-5.6.5-2 2022-04-29 21:08:03 +02:00
Sergei Golubchik
4ffffd98a5 update columnstore 2022-02-05 14:50:25 +01:00
Sergei Golubchik
77b3777bab update columnstore to 6.2.3-1 2022-01-30 16:37:12 +01:00
Sergei Golubchik
646e2f423b update columnstore to 5.6.4-1 2022-01-29 16:28:31 +01:00
Sergei Golubchik
186c1fa250 Merge branch '10.5' into 10.6 2021-12-07 22:11:30 +01:00
Sergei Golubchik
88ac91c7cc ColumnStore and S3 SUMMARY/DESCRIPTION for RPM 2021-12-07 21:31:00 +01:00
Sergei Golubchik
e7199671b0 columnstore 2021-11-04 09:49:59 +01:00
Oleksandr Byelkin
ad3e416e8d columnstore-6.2.1-1 2021-10-29 13:04:10 +02:00
Oleksandr Byelkin
1974df01d5 columnstore-5.6.3-2 2021-10-29 12:19:34 +02:00
Oleksandr Byelkin
b5569b6240 Update columnstore 2021-08-02 20:45:40 +02:00
Oleksandr Byelkin
a4482cdbed new columnstore 2021-08-02 10:18:35 +02:00
Sergei Golubchik
f44c5e5eb9 switch columnstore from pre-alpha 6.1.1 back to 5.5.2-3
suppress columnstore boost warning
2021-05-19 22:54:14 +02:00
Oleksandr Byelkin
a61e556141 new column store 5.5.2-2 2021-05-02 09:06:27 +02:00
Vicențiu Ciorbaru
3019d1cb43 Update columnstore to following cleanup of SELECT_LEX 2021-04-21 14:51:15 +03:00
Marko Mäkelä
94b4578704 Merge 10.5 into 10.6 2021-02-17 19:39:05 +02:00
Sergei Golubchik
a89b7c1d6a columnstore 5.5.1-2 2021-02-15 16:44:37 +01:00
zhaorenhai
8a495d7f90
MDEV-24647 Columnstore storage engine cannot be compiled with mariadb server on aarch64 platform (#1742) 2021-01-30 10:50:14 +03:00
Marko Mäkelä
0dfabf6e40 Fixup 92abdcca5a
Revert an accidental update of ColumnStore.
A different submodule is being used between MariaDB 10.5 and 10.6.
The submodule was accidentally updated to the 10.5 version in the merge.
2021-01-14 17:35:07 +02:00
Sergei Golubchik
81cb3e7934 MDEV-24292 support semi-independent versioning for sub-packages
4. update columnstore
2021-01-12 16:47:23 +01:00
Roman Nozdrin
a16e3c326d Update MCS to resolve libmarias3 compulation for centos74-amd64-debug
pipeline in community BB

Fix for rebuild from source step

Disable MCS on i386|i686 platforms

This patch puts MCS debian packaging files and part of debian/control
into the engine directory
2020-11-19 13:52:33 +00:00
Roman Nozdrin
1edd224372 This patch puts MCS debian packaging files and part of debian/control
into the engine directory
2020-11-14 19:09:34 +00:00
Sergei Golubchik
9a4398b048 update columnstore 2020-10-29 10:06:32 +01:00
Roman Nozdrin
bff82f51ba Fixed compilation issues with debug build and install test issues for
Ubuntu Xenial
2020-10-23 10:47:48 +04:00
Roman Nozdrin
edfeb12919 MCS engine ref update 2020-10-20 13:11:47 +00:00
Sergei Golubchik
2c9430dae2 update columnstore 2020-08-07 13:41:47 +02:00
Sergei Golubchik
979af00b7c Move ColumnStore dependency on jemalloc from rpm Requires: to Recommends:
this makes it a weak dependency, signalling that ColumnStore can work
without jemalloc and that while jemalloc is desired, missing jemalloc
is not a fatal error.
2020-08-07 13:36:11 +02:00
Roman Nozdrin
2c5831b2c5 MCOL-4166 The solution to the minor upgrade issue
DEB package doesn't need expect and libreadline as dependencies

RPM packages now depends on jemalloc again
2020-07-28 09:48:17 +00:00
Roman Nozdrin
2726203994 Remove obsolete file from the packaging list. 2020-07-11 14:04:53 +00:00
Sergei Golubchik
d742f282fc ColumnStore RPM packaging fixes
1. move columnstore-as-a-submodule RPM packaging away from the submodule
2. set REQUIRES correctly, appending to existing REQUIRES
3. same for USER_FILELIST and CONFLICTS
4. set all variables in the correct scope
5. skip columnstore correctly (not when RPM or DEB, but when
   a plugin target is not created)
2020-07-01 08:48:31 +02:00
Patrick LeBlanc
04df0bdae7 A few important fixes for columnstore.
- fix columnstore's python dependencies (MCOL-4114)
 - reduce compiler warning count from 14k to ~100 (MCOL-4030)
 - disable bintar builds
2020-07-01 08:48:05 +02:00
Roman Nozdrin
994026b77f Cmake now ignores ColumnStore without an explicit -DDEB | -DRPM and
-DPLUGIN_COLUMNSTORE=YES or its analog.
2020-06-26 08:27:08 +00:00
Sergei Golubchik
ec2de1d58a update MCS 2020-06-21 23:49:45 +02:00