Cset exclude: msvensson@shellback.(none)|ChangeSet|20070330134336|02280

1 files changed, 4 insertions, 13 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 70e51c288f4..3166672dd89 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2549,16 +2549,10 @@ sub ndbcluster_wait_started($$){
 sub mysqld_wait_started($){
   my $mysqld= shift;
 
-  my $pid_from_pidfile=
-    sleep_until_file_created($mysqld->{'path_pid'},
-                             $mysqld->{'start_timeout'},
-                             $mysqld->{'pid'});
-
-  # On platforms with pseudo threads we need to save
-  # the real pid of mysqld read from pidfile
-  $mysqld->{'real_pid'}= $pid_from_pidfile;
-
-  return $pid_from_pidfile == 0;
+  my $res= sleep_until_file_created($mysqld->{'path_pid'},
+				    $mysqld->{'start_timeout'},
+				    $mysqld->{'pid'});
+  return $res == 0;
 }
 
 
@@ -4053,7 +4047,6 @@ sub stop_all_servers () {
 
       push(@kill_pids,{
 		       pid      => $mysqld->{'pid'},
-		       real_pid => $mysqld->{'real_pid'},
 		       pidfile  => $mysqld->{'path_pid'},
 		       sockfile => $mysqld->{'path_sock'},
 		       port     => $mysqld->{'port'},
@@ -4260,7 +4253,6 @@ sub run_testcase_stop_servers($$$) {
 
 	push(@kill_pids,{
 			 pid      => $mysqld->{'pid'},
-                         real_pid => $mysqld->{'real_pid'},
 			 pidfile  => $mysqld->{'path_pid'},
 			 sockfile => $mysqld->{'path_sock'},
 			 port     => $mysqld->{'port'},
@@ -4311,7 +4303,6 @@ sub run_testcase_stop_servers($$$) {
 
 	push(@kill_pids,{
 			 pid      => $mysqld->{'pid'},
-                         real_pid => $mysqld->{'real_pid'},
 			 pidfile  => $mysqld->{'path_pid'},
 			 sockfile => $mysqld->{'path_sock'},
 			 port     => $mysqld->{'port'},