diff options
| author | unknown <mtaylor@qualinost.(none)> | 2006-12-15 12:34:36 -0800 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2006-12-15 12:34:36 -0800 |
| commit | 8257db67f3836ce8fbab314c3c2b775127585e86 (patch) | |
| tree | 3f731c7641f9ecf2d893f9c009c9ad6b1de6bb2b /scripts | |
| parent | 58b4c4bf1d88f8f3b9617362d9a564e6de2c3276 (diff) | |
| download | mariadb-git-8257db67f3836ce8fbab314c3c2b775127585e86.tar.gz | |
Added /etc/mysql to my.cnf search path after /etc.
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_multi.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 2dcc8dc7bc4..6ac31a00c75 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -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)) { |