bk commit into 5.1 tree (tomas:1.2373)

[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.2373 06/05/04 11:40:55 tomas@stripped +1 -0
  Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
  into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

  mysql-test/mysql-test-run.pl
    1.113 06/05/04 11:40:48 tomas@stripped +1 -7
    manual merge

# 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/RESYNC

--- 1.112/mysql-test/mysql-test-run.pl	2006-05-01 09:14:28 +02:00
+++ 1.113/mysql-test/mysql-test-run.pl	2006-05-04 11:40:48 +02:00
@@ -1857,7 +1857,7 @@
     }
   }
 
-  if ( ndbcluster_install_slave() )
+  if ( $use_slaves and ndbcluster_install_slave() )
   {
     if ( $opt_force)
     {
@@ -2212,13 +2212,6 @@
       {
 	# 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'},[],