bk commit into 4.1 tree (jimw:1.2479) BUG#13774

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 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.2479 05/10/31 11:15:44 jimw@stripped +1 -0
  Handle decision to use mysqld-max over mysqld within mysqld_safe
  even when --ledir option is specified. (Bug #13774)

  scripts/mysqld_safe.sh
    1.76 05/10/31 11:15:40 jimw@stripped +11 -8
    Figure out whether to use mysqld or mysqld-max after we have handled
    the command-line options and .cnf files.

# 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-4.1-13774

--- 1.75/scripts/mysqld_safe.sh	2005-06-24 17:14:13 -07:00
+++ 1.76/scripts/mysqld_safe.sh	2005-10-31 11:15:40 -08:00
@@ -11,6 +11,7 @@
 # executing mysqld_safe
 
 KILL_MYSQLD=1;
+MYSQLD=
 
 trap '' 1 2 3 15			# we shouldn't let anyone kill us
 
@@ -130,14 +131,6 @@
 user=@MYSQLD_USER@
 niceness=0
 
-# Use the mysqld-max binary by default if the user doesn't specify a binary
-if test -x $ledir/mysqld-max
-then
-  MYSQLD=mysqld-max
-else
-  MYSQLD=mysqld
-fi
-
 # these rely on $DATADIR by default, so we'll set them later on
 pid_file=
 err_log=
@@ -176,6 +169,16 @@
   chown $user $mysql_unix_port_dir
 fi
 
+# Use the mysqld-max binary by default if the user doesn't specify a binary
+if test -z "$MYSQLD"
+then
+  if test -x $ledir/mysqld-max
+  then
+    MYSQLD=mysqld-max
+  else
+    MYSQLD=mysqld
+  fi
+fi
 
 if test ! -x $ledir/$MYSQLD
 then