summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorjani@a193-229-222-105.elisa-laajakaista.fi <>2005-12-14 02:01:54 +0200
committerjani@a193-229-222-105.elisa-laajakaista.fi <>2005-12-14 02:01:54 +0200
commit30692765923964c7a79a511e5bb1c3b6c88ffa0f (patch)
tree2b1e005109511c4b95526111f6bb3a821ca37f18 /support-files
parent96f8db34a5aa11cd3491283a77bbe3a7b87d04f6 (diff)
downloadmariadb-git-30692765923964c7a79a511e5bb1c3b6c88ffa0f.tar.gz
Datadir variable should not be reset, if it was
set in this script.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.server.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 6dbffdc9778..1892e8b4a46 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -56,12 +56,18 @@ if test -z "$basedir"
then
basedir=@prefix@
bindir=@bindir@
- datadir=@localstatedir@
+ if test -z "$datadir"
+ then
+ datadir=@localstatedir@
+ fi
sbindir=@sbindir@
libexecdir=@libexecdir@
else
bindir="$basedir/bin"
- datadir="$basedir/data"
+ if test -z "$datadir"
+ then
+ datadir="$basedir/data"
+ fi
sbindir="$basedir/sbin"
libexecdir="$basedir/libexec"
fi