From: Date: July 3 2009 2:35pm
Subject: bzr push into mysql-5.1 branch (df:2951 to 2953)
List-Archive: http://lists.mysql.com/commits/77903
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1645587327=="

--===============1645587327==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 2953 Daniel Fischer	2009-07-03 [merge]
      merge fix

    modified:
      sql-bench/README*
      tests/grant.pl*
 2952 Daniel Fischer	2009-07-02
      merge patch for bug#31785

    modified:
      support-files/mysql.server.sh
 2951 Jonathan Perkin	2009-06-16
      Raise version number after cloning 5.1.36

    modified:
      configure.in
=== modified file 'sql-bench/README' (properties changed: +x to -x)
=== modified file 'support-files/mysql.server.sh'
--- a/support-files/mysql.server.sh	2008-03-26 16:39:22 +0000
+++ b/support-files/mysql.server.sh	2009-07-02 13:18:12 +0000
@@ -358,11 +358,18 @@ case "$mode" in
     if test -s "$pid_file"
     then
       mysqlmanager_pid=`cat $pid_file`
-      echo $echo_n "Shutting down MySQL"
-      kill $mysqlmanager_pid
-      # mysqlmanager should remove the pid_file when it exits, so wait for it.
-      wait_for_pid removed "$mysqlmanager_pid"; return_value=$?
-
+      
+      if (kill -0 $mysqlmanager_pid 2>/dev/null)
+      then
+        echo $echo_n "Shutting down MySQL"
+        kill $mysqlmanager_pid
+        # mysqlmanager should remove the pid_file when it exits, so wait for it.
+        wait_for_pid removed "$mysqlmanager_pid"; return_value=$?
+      else
+        log_failure_msg "MySQL manager or server process #$mysqlmanager_pid is not running!"
+        rm $pid_file
+      fi
+      
       # delete lock for RedHat / SuSE
       if test -f $lock_dir
       then

=== modified file 'tests/grant.pl' (properties changed: -x to +x)

--===============1645587327==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/df@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: df@stripped
# target_branch: file:///Users/df/bzr/mysql-5.1-build/
# testament_sha1: c938550d405347fa7afa4aceabc3f7be91cdd0ee
# timestamp: 2009-07-03 14:35:55 +0200
# source_branch: file:///Users/df/bzr/mysql-5.1-build-34521/
# base_revision_id: jperkin@stripped
# 
# Begin bundle
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
F3JFOFCQoHZVJw==


--===============1645587327==--