diff options
| author | unknown <knielsen@mysql.com> | 2006-03-16 11:27:50 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-03-16 11:27:50 +0100 |
| commit | 28109fed62ef78e035ecb90cc191597a7b2bb1d5 (patch) | |
| tree | 5860de75f6f152135a1cdcceb885d6fe438881e9 /mysql-test/lib | |
| parent | 2d360cd035849ad678253be7f0d0f559ebe1898d (diff) | |
| parent | fd6d45f0b0de5a8f0767d96d8f12cbca649f454c (diff) | |
| download | mariadb-git-28109fed62ef78e035ecb90cc191597a7b2bb1d5.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-4.1
into mysql.com:/usr/local/mysql/mysql-5.1-new
mysql-test/lib/mtr_timer.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_timer.pl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/lib/mtr_timer.pl b/mysql-test/lib/mtr_timer.pl index 709cebd6407..a85ab8c6122 100644 --- a/mysql-test/lib/mtr_timer.pl +++ b/mysql-test/lib/mtr_timer.pl @@ -78,6 +78,12 @@ sub mtr_timer_start($$$) { { # 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); |