User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0.
This commit is contained in:
parent
b3f2b36ac0
commit
58ae89cb76
@ -49,7 +49,6 @@ const char *default_directories[]= {
|
||||
"sys:/etc/",
|
||||
#else
|
||||
"/etc/",
|
||||
"/etc/mysql/",
|
||||
#endif
|
||||
#ifdef DATADIR
|
||||
DATADIR,
|
||||
|
@ -437,14 +437,6 @@ sub find_groups
|
||||
{
|
||||
$data[$i] = $line;
|
||||
}
|
||||
if (-f "/etc/mysql/my.cnf" && -r "/etc/mysql/my.cnf")
|
||||
{
|
||||
open(MY_CNF, "</etc/mysql/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
|
||||
}
|
||||
for (; ($line = shift @tmp); $i++)
|
||||
{
|
||||
$data[$i] = $line;
|
||||
}
|
||||
if (-f "$homedir/.my.cnf" && -r "$homedir/.my.cnf")
|
||||
{
|
||||
open(MY_CNF, "<$homedir/.my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
|
||||
|
Loading…
x
Reference in New Issue
Block a user