bk commit into 4.1 tree (knielsen:1.2470)

[knielsen]

Below is the list of changes that have just been committed into a local
4.1 repository of knielsen. When knielsen 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.2470 06/03/16 11:21:18 knielsen@stripped +1 -0
  Fix bug in mysql-test-run.pl in ^C signal handler.

  mysql-test/lib/mtr_timer.pl
    1.3 06/03/16 11:20:31 knielsen@stripped +6 -0
    Fix bug where ^C would trigger cleanup handler in both parent and
    timeout child processes, causing duplicated messages and potential
    conflicts.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-4.1

--- 1.2/mysql-test/lib/mtr_timer.pl	2005-08-31 16:27:53 +02:00
+++ 1.3/mysql-test/lib/mtr_timer.pl	2006-03-16 11:20:31 +01:00
@@ -78,6 +78,12 @@
     {
       # Child, redirect output and exec
       # FIXME do we need to redirect streams?
+
+      # Don't do the ^C cleanup in the timeout child processes!
+      # There is actually a race here, if we get ^C after fork(), but before
+      # clearing the signal handler.
+      $SIG{INT}= 'DEFAULT';
+
       $0= "mtr_timer(timers,$name,$duration)";
       sleep($duration);
       exit(0);