@@ -318,7 +319,32 @@ int get_defaults_options(char **argv)
|
}
|
|
if (! my_defaults_group_suffix)
|
- my_defaults_group_suffix= getenv("MYSQL_GROUP_SUFFIX");
|
+ {
|
+ const char *mysql_group_suffix= getenv("MYSQL_GROUP_SUFFIX");
|
+ const char *mariadb_group_suffix= getenv("MARIADB_GROUP_SUFFIX");
|
+
|
+ if (mysql_group_suffix && mariadb_group_suffix)
|
+ {
|
+ // If both environment variables are set, concatenate their values
|
+ size_t len= strlen(mysql_group_suffix) + strlen(mariadb_group_suffix);
|
+ if (!(combined_suffix= malloc(len+1)))
|
+ DBUG_RETURN(2);
|
+
|
+ strcpy(combined_suffix, mysql_group_suffix);
|
+ strcat(combined_suffix, mariadb_group_suffix);
|
+ my_defaults_group_suffix= combined_suffix;
|
+ }
|
+ else if (mysql_group_suffix)
|
+ {
|
+ // If only MYSQL_GROUP_SUFFIX is set, use its value
|
+ my_defaults_group_suffix= mysql_group_suffix;
|
+ }
|
+ else if (mariadb_group_suffix)
|
+ {
|
+ // If only MARIADB_GROUP_SUFFIX is set, use its value
|
+ my_defaults_group_suffix= mariadb_group_suffix;
|
+ }
|
+ }
|