diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2020-09-29 12:24:48 +0530 |
|---|---|---|
| committer | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-03-22 16:18:18 +0530 |
| commit | 269328884e58e83e7dd7876f90f37e4414ecdee3 (patch) | |
| tree | df59430987f19825c848c004e6961a804e7de750 | |
| parent | 46fab5b32a84a1ffd181dd16b5cd63958faf010b (diff) | |
| download | mariadb-git-bb-10.6-MDEV-21365.tar.gz | |
MDEV-21365: Check $MARIADB_HOME/my.cnf in addition to $MYSQL_HOME/my.cnfbb-10.6-MDEV-21365
Currently for the server, we only check if $MYSQL_HOME is set. Added a check
if $MARIADB_HOME is set and try to read the configuration file from this
directory.
To keep behavior consistent with MariaDB Connector/C, checking $MARIADB_HOME
after $MYSQL_HOME.
| -rw-r--r-- | mysys/my_default.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c index c76ab8c6eb1..ec94aee290c 100644 --- a/mysys/my_default.c +++ b/mysys/my_default.c @@ -1051,8 +1051,17 @@ static const char **init_default_directories(MEM_ROOT *alloc) #endif - if ((env= getenv("MYSQL_HOME"))) + /* + If value of $MARIADB_HOME environment variable name is NULL, check + for $MYSQL_HOME + */ + if ((env= getenv("MARIADB_HOME"))) errors += add_directory(alloc, env, dirs); + else + { + if ((env= getenv("MYSQL_HOME"))) + errors += add_directory(alloc, env, dirs); + } /* Placeholder for --defaults-extra-file=<path> */ errors += add_directory(alloc, "", dirs); |