diff options
| author | hartmut@mysql.com <> | 2006-04-07 11:23:55 +0200 |
|---|---|---|
| committer | hartmut@mysql.com <> | 2006-04-07 11:23:55 +0200 |
| commit | 4a4c459fa367df4b590089b3646834df13c3eb98 (patch) | |
| tree | 53b2a624f9e559d7dcebca903ec3ab83e2ccd93c /support-files | |
| parent | af294b281e7efe59940598e33a09a7960a0be60f (diff) | |
| parent | 7ed2c6207af421ef24973e9219a43e737308aa62 (diff) | |
| download | mariadb-git-4a4c459fa367df4b590089b3646834df13c3eb98.tar.gz | |
Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.server.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 1892e8b4a46..bf17375c0eb 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -72,6 +72,10 @@ else libexecdir="$basedir/libexec" fi +# datadir_set is used to determine if datadir was set (and so should be +# *not* set inside of the --basedir= handler.) +datadir_set= + # # Use LSB init script functions for printing messages, if possible # @@ -105,11 +109,15 @@ parse_server_arguments() { case "$arg" in --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` bindir="$basedir/bin" - datadir="$basedir/data" + if test -z "$datadir_set"; then + datadir="$basedir/data" + fi sbindir="$basedir/sbin" libexecdir="$basedir/libexec" ;; - --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; + --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` + datadir_set=1 + ;; --user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --pid-file=*) server_pid_file=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --use-mysqld_safe) use_mysqld_safe=1;; |