Commit 6b6a3f51 authored by unknown's avatar unknown

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 cd26c322 326f9df2
...@@ -2904,7 +2904,7 @@ sub run_testcase ($) { ...@@ -2904,7 +2904,7 @@ sub run_testcase ($) {
# Stop Instance Manager if we are processing an IM-test case. # Stop Instance Manager if we are processing an IM-test case.
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
if ( $tinfo->{'component_id'} eq 'im' and 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.") mtr_error("Failed to stop Instance Manager.")
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment