diff options
| author | unknown <df@kahlann.erinye.com> | 2007-01-22 16:38:54 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2007-01-22 16:38:54 +0100 |
| commit | 093d0fdef6e515a208ddc8b8a33bc2d714e359f8 (patch) | |
| tree | 22d20a530db7539808385ba5207709475948aec8 /scripts | |
| parent | f9df3f914d1c6443ee298cb2f857109cef717922 (diff) | |
| parent | 7ed42304ee8912096b25935c2ff56a4ebbcb95e9 (diff) | |
| download | mariadb-git-093d0fdef6e515a208ddc8b8a33bc2d714e359f8.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-24780
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
scripts/mysqld_multi.sh:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqlaccess.sh | 4 | ||||
| -rw-r--r-- | scripts/mysqld_multi.sh | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh index 22e9d121f9a..bcaf9f8af8e 100644 --- a/scripts/mysqlaccess.sh +++ b/scripts/mysqlaccess.sh @@ -465,6 +465,9 @@ MySQLaccess::Report::Print_Header(); elsif (-f "@sysconfdir@/$script_conf") { require "@sysconfdir@/$script_conf"; } + elsif (-f "/etc/$script_conf") { + require "/etc/$script_conf"; + } # **************************** # Read in all parameters @@ -930,6 +933,7 @@ sub MergeConfigFile { sub MergeConfigFiles { my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<; MergeConfigFile("@sysconfdir@/my.cnf"); + MergeConfigFile("/etc/my.cnf"); MergeConfigFile("$dir/.my.cnf"); } diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 91afe49b46b..a68ee7fed28 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -467,6 +467,9 @@ sub find_groups if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf") { open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF); + } elsif (-f "/etc/my.cnf" && -r "/etc/my.cnf") + { + open(MY_CNF, "</etc/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF); } for ($i = 0; ($line = shift @tmp); $i++) { |