christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

Debian 10: fix loading ~/.my.cnf with MariaDB

Browse Source 
The switch to MariaDB Connector/C 3.0 involves some subtle API
changes, including the fact that "~" is not expanded to the user's
home directory anymore.  This change expands the HOME environment
variable within our code base.

Change-Id: I30bc0d4fba6f0c8001832a981aa99af7e6f2a369
This commit is contained in:
Horst Schirmeier
2019-10-22 18:09:05 +02:00
parent 14aba36c6a
commit aec09d1565
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/util/Database.cc
View File

@ -20,7 +20,7 @@ Database::Database(const std::string &username, const std::string &host, const s
#endif #endif
CommandLine &cmd = CommandLine::Inst(); CommandLine &cmd = CommandLine::Inst();
std::string db_conf_file = "~/.my.cnf"; std::string db_conf_file = std::string(getenv("HOME")) + "/.my.cnf";
if (cmd[DBDEFAULTS].count()) { if (cmd[DBDEFAULTS].count()) {
db_conf_file = cmd[DBDEFAULTS].first()->arg; db_conf_file = cmd[DBDEFAULTS].first()->arg;
} }