mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-26 18:25:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added /etc/mysql to my.cnf search path after /etc.

Browse source 
bug #25104


mysys/default.c:
  Added /etc/mysql to the search path after /etc.
scripts/mysqld_multi.sh:
  Added /etc/mysql to the my.cnf search path.
  Changed chop to chomp - since it's smarter.
This commit is contained in:
unknown 2006-12-15 12:34:36 -08:00
commit 8257db67f3
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/mysqld_multi.sh
View file

@ -472,6 +472,14 @@ 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 (defined($ENV{MYSQL_HOME}) && -f "$ENV{MYSQL_HOME}/my.cnf" &&
-r "$ENV{MYSQL_HOME}/my.cnf")
{
@ -491,7 +499,7 @@ sub find_groups
$data[$i] = $line;
}
}
chop @data;
chomp @data;
# Make a list of the wanted group ids
if (defined($raw_gids))
{