From 8e86498bf816a43bc89a267071c0e79431b03b03 Mon Sep 17 00:00:00 2001 From: Amar Jilani Date: Mon, 20 Jan 2025 23:16:53 +0000 Subject: [PATCH] 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. --- mysys/my_default.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysys/my_default.c b/mysys/my_default.c index e63a3a8abd305..0b50235aa695d 100644 --- a/mysys/my_default.c +++ b/mysys/my_default.c @@ -317,6 +317,9 @@ int get_defaults_options(char **argv) argv++; } + if (! my_defaults_group_suffix) + my_defaults_group_suffix= getenv("MARIADB_GROUP_SUFFIX"); + if (! my_defaults_group_suffix) my_defaults_group_suffix= getenv("MYSQL_GROUP_SUFFIX");