MDEV-21375: Get option group suffix from $MARIADB_GROUP_SUFFIX in addition to $MYSQL_GROUP_SUFFIX #3787
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.
Description
Currently, if the
--default-group-suffix
argument is not passed when initializingan instance of MariaDB, the
MYSQL_GROUP_SUFFIX
environment variable, if set, is used to specify the group suffix.Add an additional check for the
MARIADB_GROUP_SUFFIX
environment variable before checking forMYSQL_GROUP_SUFFIX
. This environment variable will take precedence over theMYSQL_GROUP_SUFFIX
if both are set, with the goal of furthering MariaDB's branding.This behaviour is consistent with how
MARIADB_HOME
is checked beforeMYSQL_HOME
(MDEV-21365).Release Notes
N/A
How can this PR be tested?
Create a custom config file with at least two different suffix groups.
For example:
test.cnf
Set the
MARIADB_GROUP_SUFFIX
andMYSQL_GROUP_SUFFIX
environment variables:Start the server, passing in the config file:
Run the client:
Run the appropriate query:
Basing the PR against the correct MariaDB version
Copyright
All new code of the whole pull request, including one or several files that are
either new files or modified ones, are contributed under the BSD-new license. I
am contributing on behalf of my employer Amazon Web Services, Inc.