Commit fca9224b authored by unknown's avatar unknown
Browse files

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
parents 9e26ab43 b860c4db

mysql-test/lib/mtr_timer.pl

+1 −1
Original line number Diff line number Diff line
@@ -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;

}