diff options
| author | unknown <hartmut@mysql.com> | 2006-04-07 11:23:55 +0200 |
|---|---|---|
| committer | unknown <hartmut@mysql.com> | 2006-04-07 11:23:55 +0200 |
| commit | 7589de6c10d3b15c37ca038b4bd7451b73fca9ca (patch) | |
| tree | 53b2a624f9e559d7dcebca903ec3ab83e2ccd93c /support-files | |
| parent | 040fc2d335bc8dc83b403562cde3c6e2e89c0e6a (diff) | |
| parent | f7b039cc5060313390f31098b336d4fa811ab5f8 (diff) | |
| download | mariadb-git-7589de6c10d3b15c37ca038b4bd7451b73fca9ca.tar.gz | |
Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
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;; |