Commit graph

103 commits

Author SHA1 Message Date
Alexander Barkov
4e805aed85 Merge remote-tracking branch 'origin/11.4' into 11.5 2024-07-10 12:17:09 +04:00
Alexander Barkov
5fb07d942b Merge remote-tracking branch 'origin/11.2' into 11.4 2024-07-09 21:45:37 +04:00
Oleksandr Byelkin
2447dda2c0 Merge branch '10.11' into 11.1 2024-07-08 22:40:16 +02:00
Sergei Golubchik
d88765e6e8 columnstore 23.10.1-2 2024-05-27 12:39:04 +02:00
Oleksandr Byelkin
99b370e023 Merge branch '11.2' into 11.4 2024-05-21 19:38:51 +02:00
Sergei Golubchik
f0a5412037 Merge branch '11.0' into 11.1 2024-05-13 09:52:30 +02:00
Sergei Golubchik
f9807aadef Merge branch '10.11' into 11.0 2024-05-12 12:18:28 +02:00
Sergei Golubchik
a6b2f820e0 Merge branch '10.6' into 10.11 2024-05-10 20:02:18 +02:00
Sergei Golubchik
887bb3f735 columnstore 6.4.8-2 2024-05-09 00:04:20 +02:00
Marko Mäkelä
e3ac7b8033 Merge 10.11 into 11.0 2024-04-04 09:13:19 +03:00
Aleksey Midenkov
af4df93cf8 Columnstore empty submodule fix 2
Original problem was error when configuring without initialized
submodule Columnstore:

  The source directory

    /home/midenok/src/mariadb/10.6c/src/storage/columnstore/columnstore

  does not contain a CMakeLists.txt file.

The original fix disabled Columnstore build when PLUGIN_COLUMNSTORE
was not defined, but this seems to be wrong and any plugin should be
built if it is not explicitly disabled. This is expected by buildbots.

Thanks to Vladislav Vaintroub <vvaintroub@gmail.com> for the fix
2024-04-03 16:49:44 +03:00
Aleksey Midenkov
099ca49cc2 Columnstore empty submodule fix
CMake doesn't set ${PLUGIN_COLUMNSTORE} to anything.
2024-04-02 00:14:55 +03:00
Sergei Golubchik
6ef0b2ee5f Merge branch '10.11' into 11.0 2024-02-01 18:57:08 +01:00
Sergei Golubchik
87e13722a9 Merge branch '10.6' into 10.11 2024-02-01 18:36:14 +01: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
Oleksandr Byelkin
fe490f85bb Merge branch '10.11' into 11.0 2024-01-30 08:54:10 +01:00
Oleksandr Byelkin
14d930db5d Merge branch '10.6' into 10.11 2024-01-30 08:17:58 +01:00
Oleksandr Byelkin
25c0806867 Merge branch '10.5' into 10.6 2024-01-30 07:43:15 +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
0f5613a25f Merge branch '11.0' into 11.1 2023-11-08 18:03:08 +01:00
Oleksandr Byelkin
48af85db21 Merge branch '10.11' into 11.0 2023-11-08 17:09:44 +01:00
Oleksandr Byelkin
04d9a46c41 Merge branch '10.6' into 10.10 2023-11-08 16:23:30 +01:00
Oleksandr Byelkin
653f79a66c New Columnstoge vcolumnstore-23.02.4-1 2023-08-09 16:21:29 +02:00
Sergei Golubchik
51b93a096e columnstore warnings with gcc 12.x and 13.x 2023-06-05 20:16:34 +02:00
Sergei Golubchik
2f2047be35 MDEV-25080 Switch to new version of ColumnStore
6.4.7-1 -> 23.02.3-1
2023-06-05 20:16:24 +02:00
Marko Mäkelä
5a1f7522a5 Fix ColumnStore again
This fixes up commit e371b1e264
that accidentally reverted d77aaa6994.
2023-03-27 13:43:18 +03:00
Marko Mäkelä
e371b1e264 MDEV-28883 fixup: clang -Winconsistent-missing-override 2023-03-24 15:12:08 +02:00
Sergei Golubchik
d77aaa6994 MCOL-5437 columnstore fails to compile to due old cs->casedn_multiply use
update columnstore
2023-03-10 09:59:22 +01:00
Sergei Golubchik
5f33351f48 MCOL-5437 columnstore fails to compile to due old cs->casedn_multiply use
update columnstore
2023-03-08 21:23:01 +01:00
Sergei Petrunia
10a974adc9 Merge 11.0-selectivity into 11.0 2023-02-15 12:03:12 +03:00
Daniel Black
9656356b55 MDEV-30203 Move mysql symlinks to different package
For both Deb and RPM, create mariadb-client-compat and
mariadb-server-compat containing the mysql links to the mariadb
named executables/scripts.

The mariadb-client-core mysqlcheck was moved to mariadb-client-compat.

The symlinks in MYSQL_ADD_EXECUTABLE is tagged as a
{Client,Server}Symlinks component and placed in
the symlinks packages.

Man pages are restructured be installed into compat package
if that matches the executable.

Columnstore has a workaround as it doesn't use the cmake/plugin.cmake.

Scripts likewise have compatibility symlinks are in
the {server,client}-compat packages.

Co-author: Andrew Hutchings <andrew@linuxjedi.co.uk>

Closes #2390
2023-02-12 12:15:22 +01:00
Sergei Petrunia
6ca762c846 Update columnstore to include the patch to compile with the new cost model APIs 2023-02-03 13:26:02 +03:00
Oleksandr Byelkin
b923b80cfd Merge branch '10.6' into 10.7 2023-01-31 09:33:58 +01:00
Oleksandr Byelkin
c3a5cf2b5b Merge branch '10.5' into 10.6 2023-01-31 09:31:42 +01:00
Oleksandr Byelkin
5e196a7b73 Merge branch '10.6' into 10.7 2022-11-03 11:28:41 +01:00
Sergei Golubchik
d157b250ff update colunmstore 2022-11-03 11:20:33 +01:00
Oleksandr Byelkin
2e2173a359 Merge branch '10.6' into 10.7 2022-11-02 21:06:47 +01:00
Sergei Golubchik
b798944a93 update colunmstore 2022-11-02 19:01:11 +01:00
Sergei Golubchik
b4a58581fd columnstore 5.6.8-1 2022-10-26 19:29:46 +02:00
Daniel Black
e80acbbe91 Merge branch 10.6 into 10.7 2022-10-25 16:02:57 +11:00
Oleksandr Byelkin
44f2ece543 columnstore-6.4.6-1 2022-10-20 18:55:09 +02:00
Oleksandr Byelkin
1d48041982 Merge branch '10.6' into 10.7 2022-08-08 17:12:32 +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
fd132be117 Merge branch '10.6' into 10.7 2022-05-11 11:25:33 +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