diff options
| author | unknown <kent@mysql.com> | 2005-08-16 19:53:39 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-08-16 19:53:39 +0200 |
| commit | ace647d158219c47914854f22702de348933e5da (patch) | |
| tree | 5b6d3b064a18fddd1275ff3a4228aa9d98919588 /mysql-test/lib | |
| parent | 97441bb118c9c24578bfe04849a7193f2231c15b (diff) | |
| parent | 996eb5df5d7c22c3196c943c292230aadd74fe18 (diff) | |
| download | mariadb-git-ace647d158219c47914854f22702de348933e5da.tar.gz | |
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
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_process.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl index 1eb4f6b7c58..e4cdaff1e77 100644 --- a/mysql-test/lib/mtr_process.pl +++ b/mysql-test/lib/mtr_process.pl @@ -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 |