cmake: fix MARIADB_MYSQL_INSTALL_DB_SCRIPT usage#2040
Merged
BareosBot merged 4 commits intobareos:masterfrom Dec 18, 2024
Merged
Conversation
fff6aa7 to
722c2e2
Compare
Contributor
|
Should we backport this ? |
Contributor
Author
|
I think we certainly want it fixed for 24 (and certainly for 23), I will rebase to fix the conflicts. |
- split the variable to be db specific we now have MYSQL_INSTALL_DB_SCRIPT for mysql installation and use MARIADB_INSTALL_DB_SCRIPT pointing to `mariadb-install-db` binary. - replace harcoded binary in mysql.sh script. - adjust mariabackup systemtest to override correctly `MYSQL_` variables. This fix internal issue#94 Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com>
- in the foward port we renable mariabackup test on SUSE. Signed-off-by: Bruno Friedmann <bruno.friedmann@bareos.com> (cherry picked from commit 5558563)
722c2e2 to
e155b22
Compare
7 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Starting with MariaDB 11x version more and more binary call with the old
mysql name start to be deprecated. As those warnings might interfere with
our systemtests results, we change the call to use native MariaDB binaries.
MYSQL_INSTALL_DB_SCRIPT for mysql installation and use
MARIADB_INSTALL_DB_SCRIPT pointing to
mariadb-install-dbbinary.MYSQL_variables.
This fix internal issue#94
We also forward port 5558563ef but without disabling systemtest on SUSE.
Thank you for contributing to the Bareos Project!
Please check
If you have any questions or problems, please give a comment in the PR.
Helpful documentation and best practices
Checklist for the reviewer of the PR (will be processed by the Bareos team)
Make sure you check/merge the PR using
devtools/pr-toolto have some simple automated checks run and a proper changelog record added.General
Source code quality