Commit ace647d1 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


ndb/tools/Makefile.am:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
parents 97441bb1 996eb5df

mysql-test/lib/mtr_process.pl

+2 −1
Original line number Diff line number Diff line
@@ -752,6 +752,7 @@ sub mtr_ping_mysqld_server () { 
#

##############################################################################



# FIXME check that the pidfile contains the expected pid!



sub sleep_until_file_created ($$$) {

  my $pidfile= shift;
@@ -762,7 +763,7 @@ sub sleep_until_file_created ($$$) { 
  {

    if ( -r $pidfile )

    {

      return 1;

      return $pid;

    }



    # Check if it died after the fork() was successful