bk commit into 4.1 tree (jimw:1.2181) BUG#9852

[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.2181 05/04/13 14:57:50 jimw@stripped +1 -0
  Fix sh portability problem in mysql.server.sh (Bug #9852)

  support-files/mysql.server.sh
    1.38 05/04/13 14:57:47 jimw@stripped +8 -6
    Use variable for log_* commands instead of alias

# 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-9852

--- 1.37/support-files/mysql.server.sh	2005-03-31 02:25:00 -08:00
+++ 1.38/support-files/mysql.server.sh	2005-04-13 14:57:47 -07:00
@@ -60,9 +60,11 @@
 lsb_functions="/lib/lsb/init-functions"
 if test -f $lsb_functions ; then
   source $lsb_functions
+  log_success_msg=log_success_msg
+  log_failure_msg=log_failure_msg
 else
-  alias log_success_msg="echo \ SUCCESS! "
-  alias log_failure_msg="echo \ ERROR! "
+  log_success_msg="echo \ SUCCESS! "
+  log_failure_msg="echo \ ERROR! "
 fi
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin
@@ -107,9 +109,9 @@
   done
 
   if test -z "$i" ; then
-    log_success_msg
+    $log_success_msg
   else
-    log_failure_msg
+    $log_failure_msg
   fi
 }
 
@@ -234,10 +236,10 @@
   'reload')
     if test -s "$pid_file" ; then
       mysqld_pid=`cat $pid_file`
-      kill -HUP $mysqld_pid && log_success_msg "Reloading service MySQL"
+      kill -HUP $mysqld_pid && $log_success_msg "Reloading service MySQL"
       touch $pid_file
     else
-      log_failure_msg "MySQL PID file could not be found!"
+      $log_failure_msg "MySQL PID file could not be found!"
     fi
   ;;