diff options
| author | unknown <df@kahlann.erinye.com> | 2007-01-09 09:32:56 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2007-01-09 09:32:56 +0100 |
| commit | 81cf3b8051bfda2c23cc96fa78c6362253fa48ff (patch) | |
| tree | 856d84b766dbb0e6f6001060af3fe832276d27a8 /scripts/mysqlaccess.sh | |
| parent | c9149b9c481948e4dcdc4c81784ed4fa06ae061a (diff) | |
| download | mariadb-git-81cf3b8051bfda2c23cc96fa78c6362253fa48ff.tar.gz | |
BUG#24780 workaround for broken installations that depend on using /etc, but were configured differently
scripts/mysqlaccess.sh:
also look in /etc
scripts/mysqld_multi.sh:
also look in /etc
Diffstat (limited to 'scripts/mysqlaccess.sh')
| -rw-r--r-- | scripts/mysqlaccess.sh | 4 |
1 files changed, 4 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"); } |