diff options
| author | jimw@mysql.com <> | 2005-08-26 12:02:06 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-08-26 12:02:06 -0700 |
| commit | e2643c2942fb07e25d9207c04a0c8dd1bdf845ce (patch) | |
| tree | d8abafc5262c975a5b6fe106b4b18e0165101864 /support-files/mysql.server.sh | |
| parent | 7a45cd2dadb4f3f3b0d042d8cfe426b85bd8ec46 (diff) | |
| download | mariadb-git-e2643c2942fb07e25d9207c04a0c8dd1bdf845ce.tar.gz | |
Fix handling of libexecdir and sbindir in mysql.server, and note that
basedir and datadir settings in script may be overwritten by settings
in configuration files. (Bug #12550)
Diffstat (limited to 'support-files/mysql.server.sh')
| -rw-r--r-- | support-files/mysql.server.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 6757a1052a8..6dbffdc9778 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -39,7 +39,8 @@ # If you want to affect other MySQL variables, you should make your changes # in the /etc/my.cnf, ~/.my.cnf or other MySQL configuration files. -# If you change base dir, you must also change datadir +# If you change base dir, you must also change datadir. These may get +# overwritten by settings in the MySQL configuration files. basedir= datadir= @@ -61,8 +62,8 @@ then else bindir="$basedir/bin" datadir="$basedir/data" - sbindir="$basedir/bin" - libexecdir="$basedir/bin" + sbindir="$basedir/sbin" + libexecdir="$basedir/libexec" fi # @@ -99,8 +100,8 @@ parse_server_arguments() { --basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'` bindir="$basedir/bin" datadir="$basedir/data" - sbindir="$basedir/bin" - libexecdir="$basedir/bin" + sbindir="$basedir/sbin" + libexecdir="$basedir/libexec" ;; --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; @@ -240,7 +241,7 @@ case "$mode" in if test -x $libexecdir/mysqlmanager then manager=$libexecdir/mysqlmanager - elif test -x $bindir/mysqlmanager + elif test -x $sbindir/mysqlmanager then manager=$sbindir/mysqlmanager fi |