bk commit into 5.0 tree (jonas:1.2252)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 repository of jonas. When jonas 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@stripped, 2006-09-14 12:22:44+02:00, jonas@stripped +1 -0
  ndb - autotest
    more script mongeling

  ndb/test/run-test/autotest-run.sh@stripped, 2006-09-14 12:22:43+02:00,
jonas@stripped +6 -5
    mer script mongeling

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/50-atrt

--- 1.1/ndb/test/run-test/autotest-run.sh	2006-09-14 12:22:48 +02:00
+++ 1.2/ndb/test/run-test/autotest-run.sh	2006-09-14 12:22:48 +02:00
@@ -144,11 +144,11 @@
 # check ndb_cpcc fail hosts#
 ############################
 failed=`ndb_cpcc $hosts | awk '{ if($1=="Failed"){ print;}}'`
-if [ "$failed ]
+if [ "$failed" ]
 then
   echo "Cant contact cpcd on $failed, exiting"
   exit 1
-th
+fi
 
 #############################
 # Function for replacing the#
@@ -182,6 +182,7 @@
     then
 	echo "$test_dir/conf-$1.cnf"
     elif [ -f $test_dir/conf-$HOST.cnf ]
+    then
 	echo "$test_dir/conf-$HOST.cnf"
     else
 	echo "Unable to find conf file looked for" 1>&2
@@ -216,8 +217,8 @@
 # Make directories needed
 
 p=`pwd`
-run_dir=$base_dir/run-$dir-mysql-$clone-$target.$$
-res_dir=$base_dir/result-$dir-mysql-$clone-$target/$DATE
+run_dir=$install_dir/run-$RUN-mysql-$clone-$target.$$
+res_dir=$base_dir/result-$RUN-mysql-$clone-$target/$DATE
 tar_dir=$base_dir/saved-results
 
 mkdir -p $run_dir $res_dir $tar_dir
@@ -229,7 +230,7 @@
 # Do sed substitiutions
 # 
 cd $run_dir
-choose $conf $run_hosts > d.tmp.$$
+choose $conf $hosts > d.tmp.$$
 sed -e s,CHOOSE_dir,"$run_dir/run",g < d.tmp.$$ > my.cnf
 
 # Setup configuration