bk commit into 5.0 tree (msvensson:1.2562)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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, 2007-10-31 15:25:09+01:00, msvensson@shellback.(none) +1 -0
  Remove mysqld_wait_started

  mysql-test/mysql-test-run.pl@stripped, 2007-10-31 15:25:07+01:00, msvensson@shellback.(none) +6 -24
    Remove mysqld_wait_started

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-10-30 23:30:02 +01:00
+++ b/mysql-test/mysql-test-run.pl	2007-10-31 15:25:07 +01:00
@@ -295,7 +295,6 @@ sub rm_ndbcluster_tables ($);
 sub ndbcluster_install ($);
 sub ndbcluster_start ($$);
 sub ndbcluster_wait_started ($$);
-sub mysqld_wait_started($);
 sub run_benchmarks ($);
 sub initialize_servers ();
 sub mysql_install_db ();
@@ -2285,22 +2284,6 @@ sub ndbcluster_wait_started($$){
 }
 
 
-
-sub mysqld_wait_started($){
-  my $mysqld= shift;
-
-  if (sleep_until_file_created($mysqld->{'path_pid'},
-			       $mysqld->{'start_timeout'},
-			       $mysqld->{'proc'}) == 0)
-  {
-    # Failed to wait for pid file
-    return 1;
-  }
-
-  return 0;
-}
-
-
 sub ndb_mgmd_wait_started($) {
   my ($cluster)= @_;
 
@@ -3829,7 +3812,6 @@ sub mysqld_start ($$$) {
 				 $mysqld->{'start_timeout'},
 				 $mysqld->{'proc'}))
   {
-
     mtr_error("Failed to start mysqld $mysqld->{'type'}");
   }
 
@@ -4032,6 +4014,7 @@ sub started_servers {
 }
 
 
+
 sub run_testcase_stop_servers($$$) {
   my ($tinfo, $do_restart, $do_slave_restart)= @_;
 
@@ -4219,14 +4202,13 @@ sub run_testcase_start_servers($) {
   # Wait for mysqld's to start
   foreach my $mysqld (@{$master},@{$slave})
   {
-
     next if ! defined $mysqld->{'proc'};
 
-    if (mysqld_wait_started($mysqld))
-    {
-      # failed to start
-      $tinfo->{'comment'}=
-	"Failed to start $mysqld->{'type'} mysqld $mysqld->{'idx'}";
+    if (sleep_until_file_created($mysqld->{'path_pid'},
+				 $mysqld->{'start_timeout'},
+				 $mysqld->{'proc'}) == 0) {
+      $tinfo->{comment}=
+	"Failed to start $mysqld->{'type'} $mysqld->{'idx'}";
       return 1;
     }
   }