Commit Graph

658 Commits

Author SHA1 Message Date
Michal Schorm
8c1b8ae695 Rebase to 10.5.8 2020-11-12 01:51:15 +01:00
Michal Schorm
51b8f2af1b Rebase to 10.5.7 2020-11-06 03:42:13 +01:00
Michal Schorm
405df6a0a5 Add workaround for https://pagure.io/fm-orchestrator/issue/1614 2020-10-22 15:13:57 +02:00
Michal Schorm
04c626f762 Fix of mariadb-ownsetup patch. Since we do CMake out-of-source builds, and the SOURCE and BUILD directiories differ, the bug that was present in the patch started to cause a issues.
In the CMake "CONFIGURE_FILE(<input> <output>)" command, the <input> path is treated relative to SOURCE dir, however the <output> patch is relative to BUILD dir.
Since the file has been copied to a wrong location, instead in-place updated as originally intended, the file that was later installed was the original unchanged file.

Resolves: #1873999, #1874446

Fix mariadb-pcdir.patch hunk
2020-10-22 14:02:19 +02:00
Lukas Javorsky
21e76c8255 Rebase to 10.5.5
Add manual for aria_s3_copy
2020-10-22 14:02:19 +02:00
Lukas Javorsky
2b8b704762 Rebase to 10.5.4 2020-10-22 14:02:19 +02:00
Lukas Javorsky
be6da51b15 Rebase to 10.5.3
Add failing tests
2020-10-22 14:02:19 +02:00
Michal Schorm
8d4561c7a1 Rebase to 10.5.2 - Beta
TokuDB SE has been deprecated https://jira.mariadb.org/browse/MDEV-19780
Remove the RocksDB manpage when RocksDB is not built
Add failing tests
2020-10-22 14:02:19 +02:00
Michal Schorm
a35e17b2cb Rebase to 10.5.1 - Beta Update to build against PCRE2 2020-10-22 14:02:19 +02:00
Michal Schorm
1dd39c3767 Rebase to 10.5.0 - Alpha 2020-10-22 14:02:19 +02:00
Michal Schorm
da6d1476e3 Merge branch '10.5' 2020-10-22 13:55:43 +02:00
Michal Schorm
5fc6992062 HOUSEKEEPING COMMIT - get to the same content as 'master' 4e9605 2020-10-22 13:54:39 +02:00
Michal Schorm
4e960545a8 The testsuite passed several times on all architectures
Switch to the basic set until new upstream release
2020-09-06 23:21:38 +02:00
Michal Schorm
81a4f8d04e Fix building when built with "%bcond_with test"
(which means: without the testsuite)
2020-09-06 23:21:29 +02:00
Michal Schorm
76e6c4c773 Fix of mariadb-ownsetup patch.
Since we do CMake out-of-source builds, and the SOURCE and BUILD directiories differ, the bug that was present in the patch started to cause a issues.

In the CMake "CONFIGURE_FILE(<input> <output>)" command, the <input> path is treated relative to SOURCE dir, however the <output> patch is relative to BUILD dir.
Since the file has been copied to a wrong location, instead in-place updated as originally intended, the file that was later installed was the original unchanged file.

Resolves: #1873999, #1874446
2020-09-03 13:41:45 +02:00
Michal Schorm
35b4fa67d9 Add failing tests for 10.4.14 2020-08-21 09:42:35 +02:00
Michal Schorm
24c0e12fb3 Rebase to 10.4.14 2020-08-20 14:12:14 +02:00
Michal Schorm
c031558f68 Do CMake out-of-source builds
Force the CMake change regarding the in-source builds also to F31 and F32
Use CMake macros instead of cmake & make direct commands
%%cmake macro covers the %%{set_build_flags}, so they are not needed
Other changes to compile flags must be specified *after* the %%cmake macro
2020-08-18 14:59:54 +02:00
0691fec148 Update expected bundled PCRE version
c1291d7a6b
2020-08-07 10:49:30 +00:00
aace92178f Move mysqld_safe_helper back to server subpackage
mysqld_safe is a script that calls the mysqld_safe_helper binary, so
being able to install one without the other doesn't make sense.
2020-08-07 10:47:24 +00:00
8dd95cd3f6 Fix %ifarch usage
When rebuilding mariadb on EL7, I noticed that tokudb, mroonga, and
rocksdb were enabled, despite what this conditional appears to do.
After some experimentation, I can see that %ifarch does not support
appending another conditional with &&.  To achieve the desired logic,
the statement must be separate conditionals.
2020-08-07 10:45:06 +00:00
Jeff Law
cdfc0ff977 Disable LTO 2020-08-05 14:26:56 -06:00
Fedora Release Engineering
70dd4cf2bc - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 04:24:00 +00:00
Fedora Release Engineering
1fa717acc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 06:52:51 +00:00
Michal Schorm
53d9ba46f0 Make conflicts between corresponding mariadb and mysql packages explicit
Get rid of the Conflicts macro, it was intended to mark conflicts with *upstream* packages
2020-07-14 15:04:03 +02:00
Michal Schorm
d8b968613a Extend Perl "Requires" filtering to wsrep
Resolves: #1845376
2020-06-18 12:55:01 +02:00
Michal Schorm
43456681ea Remove PCDIR patch, upstreamed (in a way)
The upstream now defaults to the location we need, although the server pkgconfig file location is still NOT configurable.
The CMake INSTALL_PCDIR option affects only the client library pkgconfig file location.
2020-06-09 13:12:19 +02:00
Michal Schorm
9486872b39 Merge branch 'master' into 10.4 2020-06-08 10:33:56 +02:00
Michal Schorm
99964e0b7f Minor tweaks
- use %ifarch consistently through the SPECfile
- update minimal PCRE version needed
- reword %prep section (move all removals to one place)
2020-06-08 10:25:56 +02:00
Michal Schorm
5df7c2e7c7 The testsuite for 10.4.13 has been tested.
There was one randomly failing test: "spider/bugfix.wait_timeout"
2020-06-08 10:25:56 +02:00
Michal Schorm
82422dc7ae Remove ancient patch that is no longer used
All Python scripts are now written in Python 3 and their shebang is set by -DPYTHON_SHEBANG CMake option
2020-06-08 10:25:56 +02:00
Michal Schorm
22a05804da Remove ancient patch that wasn't used for ages
The default MariaDB Galera replication is now DISABLED by default, because it needs to be configured prior enabling
2020-06-08 10:25:56 +02:00
Michal Schorm
383e14b547 Rebase to 10.4.13
Patch mariadb-pythonver upstreamed (upstream now use only python 3)
2020-06-08 10:25:56 +02:00
Lukas Javorsky
e0f7005539 Add mariadb_rpl.h to deleted libraries from devel package 2020-05-24 10:48:58 +02:00
Michal Schorm
6fa4237c6e Remove the RocksDB manpage when RocksDB is not built ( = on architectures without RocksDB ) 2020-04-14 16:03:19 +02:00
Michal Schorm
b44b18ea82 Revert "Aditional fix of string quoting for rpm >= 4.16"
This reverts commit 8e28ecd511.

Reasoning: The partentheses must be around both (the macro and "64") or none, so it will be the same type comparsion (number-number || string-string)
2020-04-14 15:15:48 +02:00
Michal Schorm
8e28ecd511 Aditional fix of string quoting for rpm >= 4.16 2020-04-09 19:08:44 +02:00
Michal Schorm
21fb29f9a1 Rebase to 10.5.2 - Beta
TokuDB SE has been deprecated https://jira.mariadb.org/browse/MDEV-19780
2020-04-09 17:55:01 +02:00
Michal Schorm
109843b4fd Rebase to 10.5.1 - Beta
Update to build against PCRE2
2020-04-09 04:17:52 +02:00
Michal Schorm
a68c79f151 Rebase to 10.5.0 - Alpha 2020-04-09 04:17:51 +02:00
Björn Esser
6fa3c4c473
Bump release 2020-04-02 13:32:14 +02:00
Björn Esser
333a690a99
Fix string quoting for rpm >= 4.16 2020-04-02 13:05:45 +02:00
Jitka Plesnikova
3731874e5e Add perl dependencies needed for tests 2020-03-27 08:37:56 +01:00
Michal Schorm
5b1b5d177d Merge branch 'master' into 10.4 2020-03-16 15:17:50 +01:00
Michal Schorm
5ef66fdfa5 Rebase mariadb-connector-c git submodule to commit fbf1db6
For fix: https://jira.mariadb.org/browse/CONC-441
2020-03-16 11:41:19 +01:00
Michal Schorm
0e21d7319c Update the fix for building in the debug mode
Upstream tracker: https://jira.mariadb.org/browse/MDEV-19740
2020-03-10 09:29:49 +01:00
Michal Schorm
e183a65fc0 Merge branch 'master' into 10.4
Intended goal:
  10.4 should now be identical to master branch
  Previously, there was MariaDB 10.3 in master (Rawhide) and 10.4 in Fedora modules
  Now, the master (Rawhide) updated to MariaDB 10.4 and 10.4 branch should only mirror changes on master.
    This way, the modules will be built from the same sources as the Rawhide content.
2020-02-10 11:10:36 +01:00
Michal Schorm
55406c8293 Rebase to 10.4.12 2020-02-07 14:34:26 +01:00
Fedora Release Engineering
ced66e28de - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 12:03:48 +00:00
Michal Schorm
43a1c998f2 Rebase to 10.4.11 - Update lists of failing tests 2020-01-19 14:08:44 +01:00