Commit 48e23ec8 authored by unknown's avatar unknown

Merge mysql.com:/usr/local/mysql/mysql-4.1

into  mysql.com:/usr/local/mysql/mysql-5.0


mysql-test/lib/mtr_timer.pl:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
parents 978c8992 fd6d45f0
...@@ -78,6 +78,12 @@ sub mtr_timer_start($$$) { ...@@ -78,6 +78,12 @@ sub mtr_timer_start($$$) {
{ {
# Child, redirect output and exec # Child, redirect output and exec
# FIXME do we need to redirect streams? # 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)"; $0= "mtr_timer(timers,$name,$duration)";
sleep($duration); sleep($duration);
exit(0); exit(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment