Skip to content

Commit b0ec993

Browse files
amarjilanisvoj
authored andcommitted
MDEV-21375: Get option group suffix from $MARIADB_GROUP_SUFFIX in addition to $MYSQL_GROUP_SUFFIX
Add check for MARIADB_GROUP_SUFFIX environment variable when --default-group-suffix argument is not passed. This environment variable will take precedence over the MYSQL_GROUP_SUFFIX environment variable if both are set. 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.
1 parent 4c695c8 commit b0ec993

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

mysys/my_default.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,9 @@ int get_defaults_options(char **argv)
317317
argv++;
318318
}
319319

320+
if (! my_defaults_group_suffix)
321+
my_defaults_group_suffix= getenv("MARIADB_GROUP_SUFFIX");
322+
320323
if (! my_defaults_group_suffix)
321324
my_defaults_group_suffix= getenv("MYSQL_GROUP_SUFFIX");
322325

0 commit comments

Comments
 (0)