bk commit into 5.0 tree (jimw:1.1899) BUG#12550

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1899 05/08/26 12:02:06 jimw@stripped +1 -0
  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)

  support-files/mysql.server.sh
    1.47 05/08/26 12:02:02 jimw@stripped +7 -6
    Note that basedir, datadir settings can be overwritten by configuration,
    and make sbindir and libexecdir distinct from bindir when setting it
    based on basedir.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-12550

--- 1.46/support-files/mysql.server.sh	2005-05-04 06:00:16 -07:00
+++ 1.47/support-files/mysql.server.sh	2005-08-26 12:02:02 -07:00
@@ -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 @@
 else
   bindir="$basedir/bin"
   datadir="$basedir/data"
-  sbindir="$basedir/bin"
-  libexecdir="$basedir/bin"
+  sbindir="$basedir/sbin"
+  libexecdir="$basedir/libexec"
 fi
 
 #
@@ -99,8 +100,8 @@
       --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 @@
     if test -x $libexecdir/mysqlmanager
     then
       manager=$libexecdir/mysqlmanager
-    elif test -x $bindir/mysqlmanager
+    elif test -x $sbindir/mysqlmanager
     then
       manager=$sbindir/mysqlmanager
     fi