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

mysql-test/lib/mtr_timer.pl

@@ -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;
 }