database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

CONC-449:

Browse Source 
Beside MYSQL_HOME we also check if MARIADB_HOME was set, and try to
read configuration file from this directory.
This commit is contained in:
Georg Richter
2020-01-29 13:22:38 +01:00
parent 84dc415fce
commit d24e742e0e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmariadb/ma_default.c
View File

@@ -128,6 +128,10 @@ char **get_default_configuration_dirs()
if ((env= getenv("MYSQL_HOME")) && if ((env= getenv("MYSQL_HOME")) &&
add_cfg_dir(configuration_dirs, env)) add_cfg_dir(configuration_dirs, env))
goto error; 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: end:
return configuration_dirs; return configuration_dirs;
error: error: