bk commit into 5.0 tree (jonas:1.2254)

[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 20:26:56+02:00, jonas@stripped +2 -0
  ndb - autotest
    fix locking between different scripts

  ndb/test/run-test/autotest-boot.sh@stripped, 2006-09-14 20:26:55+02:00, jonas@stripped +1 -1
    fix lock handling

  ndb/test/run-test/autotest-run.sh@stripped, 2006-09-14 20:26:55+02:00, jonas@stripped +12 -10
    fix lock handling

# 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.5/ndb/test/run-test/autotest-boot.sh	2006-09-14 20:26:59 +02:00
+++ 1.6/ndb/test/run-test/autotest-boot.sh	2006-09-14 20:26:59 +02:00
@@ -156,7 +156,7 @@
 ################################
 
 script=$install_dir/mysql-test/ndb/autotest-run.sh
-$script $save_args --conf=$conf --install-dir=$install_dir --suite=$RUN
+$script $save_args --conf=$conf --install-dir=$install_dir --suite=$RUN --nolock
 
 if [ "$build" ]
 then

--- 1.3/ndb/test/run-test/autotest-run.sh	2006-09-14 20:26:59 +02:00
+++ 1.4/ndb/test/run-test/autotest-run.sh	2006-09-14 20:26:59 +02:00
@@ -26,7 +26,7 @@
 
 verbose=0
 report=yes
-
+nolock=
 RUN="daily-basic"
 conf=autotest.conf
 LOCK=$HOME/.autotest-lock
@@ -43,6 +43,8 @@
                 --version) echo $VERSION; exit;;
 	        --suite=*) RUN=`echo $1 | sed s/--suite=//`;;
 	        --install-dir=*) install_dir=`echo $1 | sed s/--install-dir=//`;;
+                --clone=*) clone=`echo $1 | sed s/--clone=//`;;
+	        --nolock) nolock=true;;
         esac
         shift
 done
@@ -96,19 +98,16 @@
 # If it does exit. 		      #
 #######################################
 
-if [ -f $LOCK ]
+if [ -z "$nolock" ]
 then
+    if [ -f $LOCK ]
+    then
 	echo "Lock file exists: $LOCK"
 	exit 1
+    fi
+    echo "$DATE $RUN" > $LOCK
 fi
 
-#######################################
-# If the lock file does not exist then#
-# create it with date and run info    #
-#######################################
-
-echo "$DATE $RUN" > $LOCK
-
 #############################
 #If any errors here down, we#
 # trap them, and remove the #
@@ -258,4 +257,7 @@
 cd $p
 rm -rf $res_dir $run_dir
 
-rm -f $LOCK
+if [ -z "$nolock" ]
+then
+    rm -f $LOCK
+fi