bk commit into 5.1 tree (tomas:1.2365)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.2365 06/04/19 23:50:51 tomas@stripped +1 -0
  cluster: letting first mysql server startup properly before tstarting next

  mysql-test/mysql-test-run.pl
    1.104 06/04/19 23:50:45 tomas@stripped +8 -0
    cluster: letting first mysql server startup properly before tstarting next

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.103/mysql-test/mysql-test-run.pl	2006-04-19 09:39:53 +02:00
+++ 1.104/mysql-test/mysql-test-run.pl	2006-04-19 23:50:45 +02:00
@@ -2157,6 +2157,14 @@
       if ( $using_ndbcluster_master and ! $master->[1]->{'pid'} )
       {
 	# Test needs cluster, start an extra mysqld connected to cluster
+        # First wait for first mysql server to have created ndb system tables ok
+	if ( !
sleep_until_file_created("$master->[0]->{'path_myddir'}/cluster/apply_status.ndb",
+					$master->[0]->{'start_timeout'},
+					$master->[0]->{'pid'}))
+	{
+          report_failure_and_restart($tinfo);
+          return;
+	}
         mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n");
         $master->[1]->{'pid'}=
           mysqld_start('master',1,$tinfo->{'master_opt'},[],