From: jani
Date: December 14 2005 12:02am
Subject: bk commit into 5.0 tree (jani:1.1983)
List-Archive: http://lists.mysql.com/commits/134
Message-Id: <20051214000203.44713430408@rhols221.adsl.netsonic.fi>

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani 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.1983 05/12/14 02:01:54 jani@stripped +1 -0
  Datadir variable should not be reset, if it was
  set in this script.

  support-files/mysql.server.sh
    1.48 05/12/14 02:01:47 jani@stripped +8 -2
    Datadir variable should not be reset, if it was
    set in this script.

# 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:	jani
# Host:	a193-229-222-105.elisa-laajakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.47/support-files/mysql.server.sh	2005-08-26 22:02:02 +03:00
+++ 1.48/support-files/mysql.server.sh	2005-12-14 02:01:47 +02:00
@@ -56,12 +56,18 @@
 then
   basedir=@prefix@
   bindir=@bindir@
-  datadir=@localstatedir@
+  if test -z "$datadir"
+  then
+    datadir=@localstatedir@
+  fi
   sbindir=@sbindir@
   libexecdir=@libexecdir@
 else
   bindir="$basedir/bin"
-  datadir="$basedir/data"
+  if test -z "$datadir"
+  then
+    datadir="$basedir/data"
+  fi
   sbindir="$basedir/sbin"
   libexecdir="$basedir/libexec"
 fi