mirror of
https://github.com/MariaDB/server.git
synced 2026-04-22 08:15:31 +02:00
User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0.
This commit is contained in:
parent
ddc600d209
commit
0c75fbb3c4
2 changed files with 0 additions and 9 deletions
|
|
@ -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…
Add table
Add a link
Reference in a new issue