summaryrefslogtreecommitdiff
path: root/mysql-test/lib
diff options
context:
space:
mode:
authorunknown <msvensson@shellback.(none)>2006-10-18 17:16:08 +0200
committerunknown <msvensson@shellback.(none)>2006-10-18 17:16:08 +0200
commit3c0a746633122920b4fa2c42d2f64176d7e71333 (patch)
treed0d1e6334fc047b635ae0274541f409119b24377 /mysql-test/lib
parent62309faa1d478faf836da3d71b1a92b3c5ffdf61 (diff)
downloadmariadb-git-3c0a746633122920b4fa2c42d2f64176d7e71333.tar.gz
Don't stop the time in mtr_timer_timeout, that will be done after testcase or when program exit
Diffstat (limited to 'mysql-test/lib')
-rw-r--r--mysql-test/lib/mtr_timer.pl6
1 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/lib/mtr_timer.pl b/mysql-test/lib/mtr_timer.pl
index 406692e35fa..06374716c62 100644
--- a/mysql-test/lib/mtr_timer.pl
+++ b/mysql-test/lib/mtr_timer.pl
@@ -139,10 +139,8 @@ sub mtr_timer_timeout ($$) {
return "" unless exists $timers->{'pids'}->{$pid};
- # We got a timeout
- my $name= $timers->{'pids'}->{$pid};
- mtr_timer_stop($timers, $name);
- return $name;
+ # We got a timeout, return the name ot the timer
+ return $timers->{'pids'}->{$pid};
}
1;