mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02: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:
commit
fca9224bde
1 changed files with 1 additions and 1 deletions
|
|
@ -144,7 +144,7 @@ sub mtr_timer_timeout ($$) {
|
||||||
|
|
||||||
# We got a timeout
|
# We got a timeout
|
||||||
my $name= $timers->{'pids'}->{$pid};
|
my $name= $timers->{'pids'}->{$pid};
|
||||||
mtr_timer_stop($timers, $timers->{'timers'}->{$name});
|
mtr_timer_stop($timers, $name);
|
||||||
return $name;
|
return $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue