summaryrefslogtreecommitdiff
path: root/scripts/mysqlaccess.sh
diff options
context:
space:
mode:
authorunknown <df@kahlann.erinye.com>2006-12-07 15:02:32 +0100
committerunknown <df@kahlann.erinye.com>2006-12-07 15:02:32 +0100
commitc29d22c96dd972c890cce5fc3a27138c50a4ce37 (patch)
tree9929a44698f605d5a19f1cb2617b2968df1091e3 /scripts/mysqlaccess.sh
parent5f2e2a5c5c3a1c97f4fdc0ad37f9c836efc2b467 (diff)
downloadmariadb-git-c29d22c96dd972c890cce5fc3a27138c50a4ce37.tar.gz
BUG#24780 use --sysconfdir in scripts
scripts/Makefile.am: pass --sysconfdir to scripts scripts/mysqlaccess.sh: use --sysconfdir instead of hardcoded /etc scripts/mysqld_multi.sh: use --sysconfdir instead of hardcoded /etc
Diffstat (limited to 'scripts/mysqlaccess.sh')
-rw-r--r--scripts/mysqlaccess.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index 654b43a8a99..22e9d121f9a 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -462,8 +462,8 @@ MySQLaccess::Report::Print_Header();
if (-f "./$script_conf") {
require "./$script_conf";
}
- elsif (-f "/etc/$script_conf") {
- require "/etc/$script_conf";
+ elsif (-f "@sysconfdir@/$script_conf") {
+ require "@sysconfdir@/$script_conf";
}
# ****************************
@@ -929,7 +929,7 @@ sub MergeConfigFile {
# =================================
sub MergeConfigFiles {
my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<;
- MergeConfigFile("/etc/my.cnf");
+ MergeConfigFile("@sysconfdir@/my.cnf");
MergeConfigFile("$dir/.my.cnf");
}