bk commit into 5.1 tree (msvensson:1.2587)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-23 16:44:41+02:00, msvensson@stripped +1 -0
  Fix problem where master_init_script(<test_name>-master.sh) script was not run
  when testing with the embedded server

  mysql-test/mysql-test-run.pl@stripped, 2008-04-23 16:44:39+02:00, msvensson@stripped +12 -11
    Fix problem where master_init_script(<test_name>-master.sh) script was not run
    when testing with the embedded server

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-04-08 14:51:42 +02:00
+++ b/mysql-test/mysql-test-run.pl	2008-04-23 16:44:39 +02:00
@@ -3558,19 +3558,20 @@ sub run_testcase ($) {
   # Write to all log files to indicate start of testcase
   run_testcase_mark_logs($tinfo, "CURRENT_TEST: $tinfo->{name}\n");
 
-  my $died= mtr_record_dead_children();
-  if ($died or $master_restart or $slave_restart)
-  {
-    if (run_testcase_start_servers($tinfo))
+  if ( $glob_use_embedded_server ) {
+    run_master_init_script($tinfo);
+  }
+  else {
+    my $died= mtr_record_dead_children();
+    if ($died or $master_restart or $slave_restart)
     {
-      mtr_report_test_name($tinfo);
-      report_failure_and_restart($tinfo);
-      return 1;
+      if (run_testcase_start_servers($tinfo))
+      {
+	mtr_report_test_name($tinfo);
+	report_failure_and_restart($tinfo);
+	return 1;
+      }
     }
-  }
-  elsif ($glob_use_embedded_server)
-  {
-    run_master_init_script($tinfo);
   }
 
   # ----------------------------------------------------------------------