bk commit into 5.0 tree (mtaylor:1.2472) BUG#26952

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.0 repository of mtaylor. When mtaylor 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@stripped, 2007-03-13 06:06:09-07:00, mtaylor@qualinost.(none) +1 -0
  BUG#26952: mysql.server needs to be able to not timeout in certain situations
  
  For systems running MySQL through heartbeat, it is imperitive that the startup scripts 
  not only return correct return values, but do not return until success or failure has
been 
  determined. This is a different behavior than is typically wanted for the startup 
  of a normal machine. 
  
  This patch adds support for a timeout variable for mysql.server. Read from my.cnf, this
  variable defaults to 900 (the current default). A value of 0 means not to wait at all
for
  startup confirmation. A negative value means to wait forever.  

  support-files/mysql.server.sh@stripped, 2007-03-13 06:06:02-07:00, mtaylor@qualinost.(none)
+9 -1
    Added support for a timeout variable to control timing out our wait for server
startup. BUG#26952

# 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:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql-5.0-init

--- 1.53/support-files/mysql.server.sh	2007-03-13 06:06:22 -07:00
+++ 1.54/support-files/mysql.server.sh	2007-03-13 06:06:22 -07:00
@@ -46,6 +46,13 @@
 basedir=
 datadir=
 
+# Default value, in seconds, afterwhich the script should timeout waiting
+# for server start. 
+# Value here is overriden by value in my.cnf. 
+# 0 means don't wait at all
+# Negative numbers mean to wait indefinitely
+service_startup_timeout=900
+
 # The following variables are only set for letting mysql.server find things.
 
 # Set some defaults
@@ -126,6 +133,7 @@
 	;;
       --user=*)  user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
       --pid-file=*) server_pid_file=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+      --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e
's/^[^=]*=//'` ;;
       --use-mysqld_safe) use_mysqld_safe=1;;
       --use-manager)     use_mysqld_safe=0;;
     esac
@@ -143,7 +151,7 @@
 
 wait_for_pid () {
   i=0
-  while test $i -lt 900 ; do
+  while test $i -ne $service_startup_timeout ; do
     sleep 1
     case "$1" in
       'created')