1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_timer.pl:
  Auto merged
This commit is contained in:
unknown
2006-10-18 16:31:38 +02:00

View File

@ -144,7 +144,7 @@ sub mtr_timer_timeout ($$) {
# We got a timeout
my $name= $timers->{'pids'}->{$pid};
mtr_timer_stop($timers, $timers->{'timers'}->{$name});
mtr_timer_stop($timers, $name);
return $name;
}