mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint scripts/mysqld_multi.sh: Auto merged mysys/default.c: SCCS merged
This commit is contained in:
commit
0f038a3bd8
1 changed files with 0 additions and 8 deletions
|
@ -490,14 +490,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
Reference in a new issue