bk commit into 5.1 tree (msvensson:1.2554)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson 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, 2008-03-04 12:32:51+01:00, msvensson@stripped +1 -0
  Don't ignore SIGCHLD since that affects waitpid on some platforms
  Fix spelling error
  Move exit_code into local scope

  mysql-test/lib/My/SafeProcess/safe_process.cc@stripped, 2008-03-04 12:32:49+01:00, msvensson@stripped +6 -7
    Don't ignore SIGCHLD since that affects waitpid on some platforms
    Fix spelling error
    Move exit_code into local scope

diff -Nrup a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc
--- a/mysql-test/lib/My/SafeProcess/safe_process.cc	2008-01-18 00:03:34 +01:00
+++ b/mysql-test/lib/My/SafeProcess/safe_process.cc	2008-03-04 12:32:49 +01:00
@@ -89,7 +89,6 @@ static void die(const char* fmt, ...)
 
 static void kill_child (void)
 {
-  int exit_code= 1;
   int status= 0;
 
   message("Killing child: %d", child_pid);
@@ -99,6 +98,7 @@ static void kill_child (void)
   pid_t ret_pid= waitpid(child_pid, &status, 0);
   if (ret_pid == child_pid)
   {
+    int exit_code= 1;
     if (WIFEXITED(status))
     {
       // Process has exited, collect return status
@@ -113,7 +113,7 @@ static void kill_child (void)
 
     exit(exit_code);
   }
-  exit(exit_code);
+  exit(1);
 }
 
 
@@ -122,13 +122,12 @@ static void handle_signal (int sig)
   message("Got signal %d, child_pid: %d", sig, child_pid);
   terminated= 1;
 
+  if (child_pid > 0)
+    kill_child();
+
   // Ignore further signals
   signal(SIGTERM, SIG_IGN);
   signal(SIGINT,  SIG_IGN);
-  signal(SIGCHLD, SIG_IGN);
-
-  if (child_pid > 0)
-    kill_child();
 
   // Continune execution, allow the child to be started and
   // finally terminated by monitor loop
@@ -237,7 +236,7 @@ int main(int argc, char* const argv[] )
       break;
     }
 
-    // Check if child has exited, normally this wil be
+    // Check if child has exited, normally this will be
     // detected immediately with SIGCHLD handler
     int status= 0;
     pid_t ret_pid= waitpid(child_pid, &status, WNOHANG);