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

support /etc/mysql/my.cnf in mysqld_multi as well.

Browse Source
This commit is contained in:
mtaylor@qualinost.(none) 2006-12-15 16:17:10 -08:00
parent 57baef9584
commit 373e280eb3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/mysqld_multi.sh
View File

@ -437,6 +437,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);
@ -446,7 +454,7 @@ sub find_groups
$data[$i] = $line; $data[$i] = $line;
} }
} }
chop @data; chomp @data;
# Make a list of the wanted group ids # Make a list of the wanted group ids
if (defined($raw_gids)) if (defined($raw_gids))
{ {