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

Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

Browse Source 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
This commit is contained in:
mtaylor@qualinost.(none) 2006-12-15 16:18:03 -08:00
commit 7f3d0c92c4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/mysqld_multi.sh
View File

@ -490,6 +490,14 @@ 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);