diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-14 09:42:05 +0200 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-14 09:42:05 +0200 |
| commit | c108939d194498dcc2f7da817f30c9a6112a260a (patch) | |
| tree | 8175b213f85abddbbbf19d7bc89ee8c7feb4976f /support-files | |
| parent | b141917a0af306743388f66a1df98a9346e8fb8d (diff) | |
| parent | 700e6cbd5ac5436039f4e7969bc97d5fb28cd11d (diff) | |
| download | mariadb-git-c108939d194498dcc2f7da817f30c9a6112a260a.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
extra/Makefile.am:
Auto merged
mysql-test/t/disabled.def:
Merged from 5.0
sql/handler.cc:
Merged from 5.0
sql/mysqld.cc:
Merged from 5.0
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 10 |
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 |