Commit 8b1f416b 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/mysql-test-run.pl:
  Auto merged
parents 88820b41 6c0ad741
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2904,7 +2904,7 @@ sub run_testcase ($) {
  # Stop Instance Manager if we are processing an IM-test case.
  # ----------------------------------------------------------------------
  if ( $tinfo->{'component_id'} eq 'im' and
       mtr_im_stop($instance_manager, $tinfo->{'name'}) != 0 )
       !mtr_im_stop($instance_manager, $tinfo->{'name'}) )
  {
    mtr_error("Failed to stop Instance Manager.")
  }