Commit cb03a7b8 authored by kent@mysql.com's avatar kent@mysql.com

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0
parents c7bdc5bb 9457373c
...@@ -752,6 +752,7 @@ sub mtr_ping_mysqld_server () { ...@@ -752,6 +752,7 @@ sub mtr_ping_mysqld_server () {
# #
############################################################################## ##############################################################################
# FIXME check that the pidfile contains the expected pid!
sub sleep_until_file_created ($$$) { sub sleep_until_file_created ($$$) {
my $pidfile= shift; my $pidfile= shift;
...@@ -762,7 +763,7 @@ sub sleep_until_file_created ($$$) { ...@@ -762,7 +763,7 @@ sub sleep_until_file_created ($$$) {
{ {
if ( -r $pidfile ) if ( -r $pidfile )
{ {
return 1; return $pid;
} }
# Check if it died after the fork() was successful # Check if it died after the fork() was successful
......
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