1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0.

Browse Source
This commit is contained in:
mtaylor@qualinost.(none) 2007-01-26 12:00:38 -08:00
parent b3f2b36ac0
commit 58ae89cb76
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysys/default.c
View File

@ -49,7 +49,6 @@ const char *default_directories[]= {
"sys:/etc/", "sys:/etc/",
#else #else
"/etc/", "/etc/",
"/etc/mysql/",
#endif #endif
#ifdef DATADIR #ifdef DATADIR
DATADIR, DATADIR,

8
scripts/mysqld_multi.sh
View File

@ -437,14 +437,6 @@ sub find_groups
{ {
$data[$i] = $line; $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") if (-f "$homedir/.my.cnf" && -r "$homedir/.my.cnf")
{ {
open(MY_CNF, "<$homedir/.my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF); open(MY_CNF, "<$homedir/.my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);