diff options
| author | unknown <df@kahlann.erinye.com> | 2007-01-22 16:33:37 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2007-01-22 16:33:37 +0100 |
| commit | 45b9381f0785848af9dc82ae14e3b64cb0b9f913 (patch) | |
| tree | be56b87a2e7fe7f14950ee29bef8001d517ae4f5 /scripts | |
| parent | 4f69569dfa77e9115418ce4b1982ec00a106a660 (diff) | |
| parent | 81cf3b8051bfda2c23cc96fa78c6362253fa48ff (diff) | |
| download | mariadb-git-45b9381f0785848af9dc82ae14e3b64cb0b9f913.tar.gz | |
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.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 48e64a6b541..79eee2712b5 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -432,6 +432,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++) { |