From d24e742e0e90f186381be411f0eee6d0baf2363c Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Wed, 29 Jan 2020 13:22:38 +0100 Subject: [PATCH] CONC-449: Beside MYSQL_HOME we also check if MARIADB_HOME was set, and try to read configuration file from this directory. --- libmariadb/ma_default.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libmariadb/ma_default.c b/libmariadb/ma_default.c index 4079b78a..297a9de1 100644 --- a/libmariadb/ma_default.c +++ b/libmariadb/ma_default.c @@ -128,6 +128,10 @@ char **get_default_configuration_dirs() if ((env= getenv("MYSQL_HOME")) && add_cfg_dir(configuration_dirs, env)) goto error; + /* CONC-449: Check $MARIADB_HOME/my.cnf in addition to $MYSQL_HOME/my.cnf */ + if ((env= getenv("MARIADB_HOME")) && + add_cfg_dir(configuration_dirs, env)) + goto error; end: return configuration_dirs; error: