From: Date: April 6 2006 7:13pm
Subject: bk commit into 5.0 tree (igreenhoe:1.2135) BUG#16240
List-Archive: http://lists.mysql.com/commits/4571
X-Bug: 16240
Message-Id: <E1FRY3N-00043I-Rl@anubis>

Below is the list of changes that have just been committed into a local
5.0 repository of greenman. When greenman 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.2135 06/04/06 10:13:46 igreenhoe@stripped +1 -0
  Fix for Bug #16240

  support-files/mysql.server.sh
    1.49 06/04/06 10:13:39 igreenhoe@stripped +10 -2
    Fixed so that if the datadir has been set via the command line,
    it won't be reset by specifing the basedir after.

# 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:	igreenhoe
# Host:	anubis.greendragongames.com
# Root:	/home/greenman/workspace-mysql/mysql/bug-5.0-16240

--- 1.48/support-files/mysql.server.sh	2005-12-13 16:01:47 -08:00
+++ 1.49/support-files/mysql.server.sh	2006-04-06 10:13:39 -07:00
@@ -72,6 +72,10 @@
   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 @@
     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;;