From ff546eed4b032cbdb4f6f18fd2b9160392674454 Mon Sep 17 00:00:00 2001
From: unknown <jimw@mysql.com>
Date: Mon, 31 Oct 2005 11:15:44 -0800
Subject: Handle decision to use mysqld-max over mysqld within mysqld_safe even
 when --ledir option is specified. (Bug #13774)

scripts/mysqld_safe.sh:
  Figure out whether to use mysqld or mysqld-max after we have handled
  the command-line options and .cnf files.
---
 scripts/mysqld_safe.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'scripts/mysqld_safe.sh')

diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index d6585f4a552..6ce4c1e0da8 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -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 @@ fi
 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 @@ then
   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
-- 
cgit v1.2.1