List:Commits« Previous MessageNext Message »
From:Hakan Kuecuekyilmaz Date:September 20 2008 4:12am
Subject:bzr commit into mysql-falcon branch (hky:274)
View as plain text  
#At bzr+ssh://bk-internal.mysql.com/bzrroot/mysql-falcon/

  274 Hakan Kuecuekyilmaz	2008-09-20
      Fixed infinitive loop.
modified:
  dbt2/include/host_fimafeng13.inc
  dbt2/include/host_tor06.inc
  dbt2/weekly_dbt2_overview.sh
  weekly_falcon_test_overview/weekly_test_overview.sh

per-file messages:
  dbt2/include/host_fimafeng13.inc
    Removed export.
  dbt2/include/host_tor06.inc
    Removed export.
  dbt2/weekly_dbt2_overview.sh
    Fixed infinitive loop.
    
    Problem was that variables in functions in Bash
    have global scope.
    
    Also refactored variables to be more safe.
  weekly_falcon_test_overview/weekly_test_overview.sh
    Reworked variables.
=== modified file 'dbt2/include/host_fimafeng13.inc'
--- a/dbt2/include/host_fimafeng13.inc	2008-09-19 13:51:21 +0000
+++ b/dbt2/include/host_fimafeng13.inc	2008-09-20 04:12:24 +0000
@@ -75,9 +75,9 @@ DO_OPROFILE[100]=''
 # Binaries
 ##################
 # On Sun Trondheim hosts /usr/local/bin is central installation, /usr/bin/ is local
-export PATH="/opt/csw/bin:/usr/local/bin:/usr/bin:/bin:/usr/sfw/bin:/usr/sbin:/opt/SUNWspro/bin:/usr/ucb:/usr/ccs/bin:$PATH"
-export PATCH=gpatch
-export MAKE=gmake
+PATH="/opt/csw/bin:/usr/local/bin:/usr/bin:/bin:/usr/sfw/bin:/usr/sbin:/opt/SUNWspro/bin:/usr/ucb:/usr/ccs/bin:$PATH"
+PATCH=gpatch
+MAKE=gmake
 OPCONTROL='sudo /usr/bin/opcontrol'
 OPREPORT='sudo /usr/bin/opreport'
 

=== modified file 'dbt2/include/host_tor06.inc'
--- a/dbt2/include/host_tor06.inc	2008-09-14 06:45:50 +0000
+++ b/dbt2/include/host_tor06.inc	2008-09-20 04:12:24 +0000
@@ -75,9 +75,9 @@ DO_OPROFILE[100]=''
 # Binaries
 ##################
 # On Sun Trondheim hosts /usr/local/bin is central installation, /usr/bin/ is local
-export PATH="/opt/csw/bin:/usr/local/bin:/usr/bin:/bin:/usr/sfw/bin:/usr/sbin:/opt/SUNWspro/bin:/usr/ucb:/usr/ccs/bin:$PATH"
-export PATCH=gpatch
-export MAKE=gmake
+PATH="/opt/csw/bin:/usr/local/bin:/usr/bin:/bin:/usr/sfw/bin:/usr/sbin:/opt/SUNWspro/bin:/usr/ucb:/usr/ccs/bin:$PATH"
+PATCH=gpatch
+MAKE=gmake
 OPCONTROL='sudo /usr/bin/opcontrol'
 OPREPORT='sudo /usr/bin/opreport'
 

=== modified file 'dbt2/weekly_dbt2_overview.sh'
--- a/dbt2/weekly_dbt2_overview.sh	2008-09-19 13:51:21 +0000
+++ b/dbt2/weekly_dbt2_overview.sh	2008-09-20 04:12:24 +0000
@@ -82,15 +82,15 @@ CONTROL_TIMESTAMP=$(date +%Y-%m-%d)
 #
 
 # Which bzr tree to use for running DBT2.
-#FALCON="$WORK/mysql-6.0"
-FALCON="$WORK/mysql-6.0-falcon"
-#FALCON="$WORK/mysql-6.0-falcon-team"
-#FALCON="$WORK/mysql-6.0-falcon-kevin"
-
-DBT2_RUNS="$BZR_BASE/weekly_dbt2_runs/${HOSTNAME}"
-OLD_DBT2_RUNS="$BZR_BASE/old_weekly_dbt2_runs/${HOSTNAME}"
-DBT2_ERROR_LOGS="$DBT2_RUNS/w$WAREHOUSES/err"
-DBT2_IO_STATS="$DBT2_RUNS/w$WAREHOUSES/io_stats"
+#FALCON="${WORK}/mysql-6.0"
+FALCON="${WORK}/mysql-6.0-falcon"
+#FALCON="${WORK}/mysql-6.0-falcon-team"
+#FALCON="${WORK}/mysql-6.0-falcon-kevin"
+
+DBT2_RUNS="${BZR_BASE}/weekly_dbt2_runs/${HOSTNAME}"
+OLD_DBT2_RUNS="${BZR_BASE}/old_weekly_dbt2_runs/${HOSTNAME}"
+DBT2_ERROR_LOGS="${DBT2_RUNS}/w${WAREHOUSES}/err"
+DBT2_IO_STATS="${DBT2_RUNS}/w${WAREHOUSES}/io_stats"
 
 W_DIR[10]='/tmp/dbt2-w10'
 W_DIR[20]='/tmp/dbt2-w20'
@@ -99,9 +99,9 @@ W_DIR[100]='/tmp/dbt2-w100'
 #
 # Binaries.
 #
-MYSQLD="$FALCON/sql/mysqld"
-MYSQL="$FALCON/client/mysql"
-MYSQLADMIN="$FALCON/client/mysqladmin"
+MYSQLD="${FALCON}/sql/mysqld"
+MYSQL="${FALCON}/client/mysql"
+MYSQLADMIN="${FALCON}/client/mysqladmin"
 #DATAGEN= SEE include/host_<hostname>.inc.
 #MAIL= SEE include/host_<hostname>.inc.
 #PERL= SEE include/host_<hostname>.inc.
@@ -109,10 +109,10 @@ MYSQLADMIN="$FALCON/client/mysqladmin"
 #
 # Files.
 #
-CONTROL="$WORK/dbt2_build_done-$CONTROL_TIMESTAMP"
-BRANCH_CONTROL="$WORK/bzr_pull_and_branch_dbt2_date-$CONTROL_TIMESTAMP"
-LOG="$WORK/weekly_dbt2_log.txt"
-BUILD_LOG="$WORK/weekly_dbt2_log.txt"
+CONTROL="${WORK}/dbt2_build_done-${CONTROL_TIMESTAMP}"
+BRANCH_CONTROL="${WORK}/bzr_pull_and_branch_dbt2_date-${CONTROL_TIMESTAMP}"
+LOG="${WORK}/weekly_dbt2_log.txt"
+BUILD_LOG="${WORK}/weekly_dbt2_log.txt"
 DATA_DIR_FILES="falcon_* ibdata* test"
 LOG_DIR_FILES="falcon_master.fl1 falcon_master.fl2 ib_logfile*"
 
@@ -145,7 +145,7 @@ MYSQLD_CONFIG_GENERAL="$MYSQLD_CONFIG_BA
   --basedir=$FALCON \
   --datadir=$DATA_DIR \
   --tmpdir=/tmp \
-  --language=$FALCON/sql/share/english \
+  --language=${FALCON}/sql/share/english \
   --key_buffer_size=8M \
   --table_cache=4096 \
   --skip-grant-tables \
@@ -194,7 +194,7 @@ MYSQLD_CONFIG_INNODB="$MYSQLD_CONFIG_GEN
 
 
 # We need libmysqlclient_r.so for DBT2's datagen binary.
-export LD_LIBRARY_PATH="$FALCON/libmysql_r/.libs"
+export LD_LIBRARY_PATH="${FALCON}/libmysql_r/.libs"
 
 #
 # Commands, which are used multiple times.
@@ -205,8 +205,8 @@ RM_DIR="rm -rf \
   ib_logfile* \
   ${HOSTNAME}.* \
   test* \
-  $LOG_DIR/falcon_* \
-  $LOG_DIR/ib_logfile* \
+  ${LOG_DIR}/falcon_* \
+  ${LOG_DIR}/ib_logfile* \
   /tmp/mysql.sock"
 
 #
@@ -225,15 +225,15 @@ start_mysqld()
     $MYSQLD $MYSQLD_CONFIG_CURRENT &
     sleep 15
 
-    k=0
+    COUNT=0
     false
     while ( [ $? -ne 0 ] )
         do
         sleep 3
-        k=$(($k + 1))
-        if [ $k -eq 120 ]; then
-            echo "[ERROR] Could not start mysqld" >> $LOG
-            echo "[ERROR] Could not start mysqld on ${HOSTNAME}" | ${MAIL} -s"WDO: error starting mysqld on ${HOSTNAME}" $ADMIN
+        COUNT=$(($COUNT + 1))
+        if [ $COUNT -eq 120 ]; then
+            echo "[ERROR]: Could not start mysqld" >> $LOG
+            echo "[ERROR]: Could not start mysqld on ${HOSTNAME}" | ${MAIL} -s"WDO: Error starting mysqld on ${HOSTNAME}" $ADMIN
             exit 1;
         fi
         $MYSQLADMIN -uroot ping
@@ -255,21 +255,21 @@ if [ $COMPILE = 'compile' ]; then
         case $PLATFORM in
             Linux)
                 # Linux gcc
-                source $BZR_BASE/include/configure_linux_gcc.inc >> $BUILD_LOG 2>&1
+                source ${BZR_BASE}/include/configure_linux_gcc.inc >> $BUILD_LOG 2>&1
 
                 J=$(cat /proc/cpuinfo | grep processor | wc -l)
                 J=$(( $J + 1 ))
                 ;;
             SunOS)
-                if [ "$ARCH" = 'i86pc' ]; then
+                if [ x"$ARCH" = x'i86pc' ]; then
                     # Solaris/x86 gcc
-                    source $BZR_BASE/include/configure_solaris_x86_gcc.inc >> $BUILD_LOG 2>&1
+                    source ${BZR_BASE}/include/configure_solaris_x86_gcc.inc >> $BUILD_LOG 2>&1
 
                     J=$(psrinfo  | wc -l)
                     J=$(( $J + 1 ))
-                elif [ "$ARCH" =  'sun4v' ]; then
+                elif [ x"$ARCH" =  x'sun4v' ]; then
                     # Solaris/SPARC gcc
-                    source $BZR_BASE/include/configure_solaris_sparc_gcc.inc >> $BUILD_LOG 2>&1
+                    source ${BZR_BASE}/include/configure_solaris_sparc_gcc.inc >> $BUILD_LOG 2>&1
 
                     J=8
                 fi
@@ -297,14 +297,14 @@ fi
 
 # Check that warehouse directory exists and has correct size.
 if [ ! -d ${W_DIR[$WAREHOUSES]} ]; then
-    echo "Directory ${W_DIR[$WAREHOUSES]} does not exist. Creating and filling it." >> $LOG
+    echo "[INFO]: Directory ${W_DIR[$WAREHOUSES]} does not exist. Creating and filling it." >> $LOG
     mkdir ${W_DIR[$WAREHOUSES]}
     $DATAGEN -w $WAREHOUSES -d ${W_DIR[$WAREHOUSES]} --mysql
 fi
 
 SIZE=$(LANG=C && du -h ${W_DIR[$WAREHOUSES]} | awk '{ print $1 }')
 if [ x${W_SIZE[$WAREHOUSES]} != x$SIZE ]; then
-    echo "Directory size of ${W_DIR[$WAREHOUSES]} does not match." >> $LOG
+    echo "[ERROR]: Directory size of ${W_DIR[$WAREHOUSES]} does not match." >> $LOG
     exit 1
 fi
 
@@ -327,24 +327,24 @@ if [ $ROTATE = 'rotate' ]; then
     for ((i=0; $i < $W_DIRS_COUNT; i=$(($i + 1))))
         do
         # Get one of the W_DIRS sub directories.
-        if [ -d $DBT2_RUNS/${W_DIRS[$i]} ]; then
-            cd $DBT2_RUNS/${W_DIRS[$i]}
+        if [ -d ${DBT2_RUNS}/${W_DIRS[$i]} ]; then
+            cd ${DBT2_RUNS}/${W_DIRS[$i]}
             OLD_DATE=$(ls FALCON* | sort -r | head -n1 | awk -F_ '{ print $2 }')
-            mkdir -p $OLD_DBT2_RUNS/$OLD_DATE
-            mv $DBT2_RUNS/* $OLD_DBT2_RUNS/$OLD_DATE
-            cp -a $BZR_BASE/dbt2.css $OLD_DBT2_RUNS/$OLD_DATE
-            cp -a $BZR_BASE/include $OLD_DBT2_RUNS/$OLD_DATE
-            cp -a $BZR_BASE/process-stop.png $OLD_DBT2_RUNS/$OLD_DATE
-            cp -a $BZR_BASE/weekly_dbt2_overview.php $OLD_DBT2_RUNS/$OLD_DATE
-            cp -a $BZR_BASE/weekly_dbt2_overview.png $OLD_DBT2_RUNS/$OLD_DATE
+            mkdir -p ${OLD_DBT2_RUNS}/${OLD_DATE}
+            mv ${DBT2_RUNS}/* ${OLD_DBT2_RUNS}/${OLD_DATE}
+            cp -a ${BZR_BASE}/dbt2.css ${OLD_DBT2_RUNS}/${OLD_DATE}
+            cp -a ${BZR_BASE}/include ${OLD_DBT2_RUNS}/${OLD_DATE}
+            cp -a ${BZR_BASE}/process-stop.png ${OLD_DBT2_RUNS}/${OLD_DATE}
+            cp -a ${BZR_BASE}/weekly_dbt2_overview.php ${OLD_DBT2_RUNS}/${OLD_DATE}
+            cp -a ${BZR_BASE}/weekly_dbt2_overview.png ${OLD_DBT2_RUNS}/${OLD_DATE}
 
             break
         fi
     done
 fi
 
-if [ ! -d $DBT2_RUNS/w$WAREHOUSES ]; then
-    mkdir $DBT2_RUNS/w$WAREHOUSES
+if [ ! -d ${DBT2_RUNS}/w${WAREHOUSES} ]; then
+    mkdir ${DBT2_RUNS}/w${WAREHOUSES}
 fi
 
 if [ ! -d $W100_DATA_COPY ]; then
@@ -394,22 +394,22 @@ for ENGINE in FALCON INNODB
     # weekly_dbt2_overview.php and weekly_dbt2_overview_graph.php.
     for i in ${CONCURRENCY[$WAREHOUSES]}
         do
-        LOG_FILE=$DBT2_RUNS/w$WAREHOUSES/"$ENGINE"_"$CONTROL_TIMESTAMP"_"$i".log
+        LOG_FILE=${DBT2_RUNS}/w${WAREHOUSES}/${ENGINE}_${CONTROL_TIMESTAMP}_${i}.log
 
         # Check whether we want an oprofile'd run.
         USE_OPROFILE=0
         for j in ${DO_OPROFILE[$WAREHOUSES]}
             do
-            if [ x"$j" = x"$i" ]; then
+            if [ $j -eq $i ]; then
                 USE_OPROFILE=1
-                OPROFILE_LOG_FILE=$DBT2_RUNS/w$WAREHOUSES/"$ENGINE"_OPROFILE_"$CONTROL_TIMESTAMP"_"$i"
+                OPROFILE_LOG_FILE=${DBT2_RUNS}/w${WAREHOUSES}/${ENGINE}_OPROFILE_${CONTROL_TIMESTAMP}_${i}.log
                 break
             fi
         done
 
         echo "$RUNS runs with $ENGINE -c$i -w$WAREHOUSES -t$RUN_TIME" > $LOG_FILE
 
-        CURRENT_IO_STATS=$DBT2_IO_STATS/"$ENGINE"_"$i"
+        CURRENT_IO_STATS=${DBT2_IO_STATS}/${ENGINE}_${i}
         mkdir $CURRENT_IO_STATS
 
         k=0
@@ -438,14 +438,14 @@ for ENGINE in FALCON INNODB
                 start_mysqld
                 $MYSQLADMIN -uroot create test
 
-                cd $DBT2_SCRIPTS/mysql
+                cd ${DBT2_SCRIPTS}/mysql
 
                 ./mysql_load_db.sh -dtest -f${W_DIR[$WAREHOUSES]} -c$MYSQL -hlocalhost -uroot -e$ENGINE
             fi
 
             if [ $W100_DATA_LOADED -eq 0 -a $WAREHOUSES -eq 100 ]; then
                 sync
-                sleep 45
+                sleep 5
 
                 $MYSQLADMIN -uroot shutdown
                 sleep 3
@@ -488,22 +488,22 @@ for ENGINE in FALCON INNODB
                 $OPCONTROL --shutdown
             fi
 
-            ${PERL} mix_analyzer.pl --infile output/$ROUND/driver/mix.log --outdir /tmp | grep new-order >> $LOG_FILE
+            ${PERL} mix_analyzer.pl --infile output/${ROUND}/driver/mix.log --outdir /tmp | grep new-order >> $LOG_FILE
 
             # Copy iostat and vmstat of this round.
             # If gnuplot is present on system, then we get a NOTPM graph for free.
-            cp output/$ROUND/iostat.out  $CURRENT_IO_STATS/"$ROUND"_iostat.out
-            cp output/$ROUND/iostatx.out $CURRENT_IO_STATS/"$ROUND"_iostatx.out
-            cp output/$ROUND/stats.out   $CURRENT_IO_STATS/"$ROUND"_stats.out
-            cp output/$ROUND/vmstat.out  $CURRENT_IO_STATS/"$ROUND"_vmstat.out
-            cp output/$ROUND/driver/notpm.png   $DBT2_RUNS/w$WAREHOUSES/"$ENGINE"_"$CONTROL_TIMESTAMP"_"$i"_"$ROUND".png
+            cp output/${ROUND}/iostat.out  ${CURRENT_IO_STATS}/${ROUND}_iostat.out
+            cp output/${ROUND}/iostatx.out ${CURRENT_IO_STATS}/${ROUND}_iostatx.out
+            cp output/${ROUND}/stats.out   ${CURRENT_IO_STATS}/${ROUND}_stats.out
+            cp output/${ROUND}/vmstat.out  ${CURRENT_IO_STATS}/${ROUND}_vmstat.out
+            cp output/${ROUND}/driver/notpm.png ${DBT2_RUNS}/w${WAREHOUSES}/${ENGINE}_${CONTROL_TIMESTAMP}_${i}_${ROUND}.png
 
             # Remove output/$ROUND directory. Because in case of of a crash
             # DBT2 writes gigabytes of error log into it.
-            rm -rf output/$ROUND
+            rm -rf output/${ROUND}
 
             # Copy error log of mysqld.
-            cp $DATA_DIR/${HOSTNAME}.err $DBT2_ERROR_LOGS/"$ENGINE"_"$CONTROL_TIMESTAMP"_"$i"_"$ROUND".err
+            cp ${DATA_DIR}/${HOSTNAME}.err ${DBT2_ERROR_LOGS}/${ENGINE}_${CONTROL_TIMESTAMP}_${i}_${ROUND}.err
             chmod -R 755 $DBT2_ERROR_LOGS
 
             ROUND=$(($ROUND + 1))
@@ -513,9 +513,9 @@ for ENGINE in FALCON INNODB
 done
 
 # Get bzr revision-id for reference.
-bzr log --limit=1 --show-ids $FALCON | head -n7 > $DBT2_RUNS/bzr_version.txt
+bzr log --limit=1 --show-ids $FALCON | head -n7 > ${DBT2_RUNS}/bzr_version.txt
 
 TIMESTAMP=$(date +%Y-%m-%d_%H:%M:%S)
 
-echo $TIMESTAMP > $FALCON/weekly_dbt2_overview_done
+echo $TIMESTAMP > ${FALCON}/weekly_dbt2_overview_done
 echo "[Info] End of Weekly DBT2 Overview: $TIMESTAMP" >> $LOG

=== modified file 'weekly_falcon_test_overview/weekly_test_overview.sh'
--- a/weekly_falcon_test_overview/weekly_test_overview.sh	2008-09-15 20:58:01 +0000
+++ b/weekly_falcon_test_overview/weekly_test_overview.sh	2008-09-20 04:12:24 +0000
@@ -29,10 +29,10 @@ source include/gnu_path.inc
 #
 # Directories.
 #
-WORK="$HOME/walldorf/mysql"
+WORK="${HOME}/walldorf/mysql"
 WORK_CURRENT="$WORK/current_weekly_falcon_test_overview_logs"
-WORK_LOCAL="$HOME/work/mysql/wfto"
-FALCON="$WORK/mysql-6.0-falcon"
+WORK_LOCAL="${HOME}/work/mysql/wfto"
+FALCON="${WORK}/mysql-6.0-falcon"
 
 if [ ! -d $WORK_CURRENT ]; then
     mkdir $WORK_CURRENT
@@ -42,33 +42,33 @@ fi
 # Control date.
 #
 TIMESTAMP=$(date +%Y-%m-%d)
-CONTROL=$WORK/bzr_pull_and_clone_date-$TIMESTAMP
+CONTROL=${WORK}/bzr_pull_and_clone_date-${TIMESTAMP}
 
 #
 # Test program and options.
 #
 MYSQL_TEST='mysql-test-run.pl'
 TEST_OPTIONS='--enable-disabled --force --skip-ndb'
-TEST_OPTIONS="$TEST_OPTIONS --suite=falcon,falcon_team"
-BIG_TEST_OPTIONS="$TEST_OPTIONS --big-test --suite-timeout=6360 --testcase-timeout=30 --do-test=.*-big"
+TEST_OPTIONS="${TEST_OPTIONS} --suite=falcon,falcon_team"
+BIG_TEST_OPTIONS="${TEST_OPTIONS} --big-test --suite-timeout=6360 --testcase-timeout=30 --do-test=.*-big"
 
-LOG=$WORK_CURRENT/'all_tests_run_'$LOG_SUFFIX
-BUILD_LOG=$WORK/'build_log_'$LOG_SUFFIX
+LOG=${WORK_CURRENT}/all_tests_run_${LOG_SUFFIX}
+BUILD_LOG=${WORK}/build_log_${LOG_SUFFIX}
 
 #
 # Clean up previous run.
 #
-rm -f $WORK/$LOG_SUFFIX.done
-rm -f $WORK_LOCAL/$LOG_SUFFIX.done
-rm -f $WORK_LOCAL/weekly_falcon_test_overview_done-*
+rm -f ${WORK}/${LOG_SUFFIX}.done
+rm -f ${WORK_LOCAL}/${LOG_SUFFIX}.done
+rm -f ${WORK_LOCAL}/weekly_falcon_test_overview_done-*
 
 #
 # Build and test Falcon.
 #
 if [ -a $CONTROL ]; then
-    ARCHIVE=$(basename $FALCON/*.tar.gz)
-    ARCHIVE_DIR=$WORK_LOCAL/$(echo $ARCHIVE | awk -F '.tar.gz' '{ print $1 }')
-    TEST_DIR="$ARCHIVE_DIR/mysql-test"
+    ARCHIVE=$(basename ${FALCON}/*.tar.gz)
+    ARCHIVE_DIR=${WORK_LOCAL}/$(echo $ARCHIVE | awk -F '.tar.gz' '{ print $1 }')
+    TEST_DIR="${ARCHIVE_DIR}/mysql-test"
 
     rm -rf $WORK_LOCAL
     mkdir $WORK_LOCAL
@@ -77,8 +77,8 @@ if [ -a $CONTROL ]; then
 
     # Build and test debug version.
     cd $ARCHIVE_DIR
-    apply_patches > $BUILD_LOG'_debug.log' 2>&1
-    BUILD/$DEBUG_BUILD >> $BUILD_LOG'_debug.log' 2>&1
+    apply_patches > ${BUILD_LOG}_debug.log 2>&1
+    BUILD/${DEBUG_BUILD} >> ${BUILD_LOG}_debug.log 2>&1
     if [ $? != 0 ]; then
         echo "[ERROR]: $DEBUG_BUILD failed!"
     else
@@ -86,15 +86,15 @@ if [ -a $CONTROL ]; then
     fi
 
     cd $TEST_DIR
-    perl $MYSQL_TEST $TEST_OPTIONS > $LOG'_debug.log'
+    perl $MYSQL_TEST $TEST_OPTIONS > ${LOG}_debug.log
 
     if [ $LOG_SUFFIX = 'walldorf' ]; then
-        perl $MYSQL_TEST $BIG_TEST_OPTIONS >> $LOG'_debug.log'
+        perl $MYSQL_TEST $BIG_TEST_OPTIONS >> ${LOG}_debug.log
     fi
 
     # Build and test non-debug version.
     cd $ARCHIVE_DIR
-    BUILD/$OPT_BUILD > $BUILD_LOG'_opt.log' 2>&1
+    BUILD/${OPT_BUILD} > ${BUILD_LOG}_opt.log 2>&1
     # Do we have a successful build?
     if [ $? != 0 ]; then
         echo "[ERROR]: $OPT_BUILD failed!"
@@ -103,17 +103,17 @@ if [ -a $CONTROL ]; then
     fi
 
     cd $TEST_DIR
-    perl $MYSQL_TEST $TEST_OPTIONS > $LOG'_opt.log'
+    perl $MYSQL_TEST $TEST_OPTIONS > ${LOG}_opt.log
 
     if [ $LOG_SUFFIX = 'walldorf' ]; then
-        perl $MYSQL_TEST $BIG_TEST_OPTIONS >> $LOG'_opt.log'
+        perl $MYSQL_TEST $BIG_TEST_OPTIONS >> ${LOG}_opt.log
     fi
 else
     TIMESTAMP=$(date +%Y-%m-%d)
-    echo '[ERROR]: Clone on file server was not scucessful.' > $WORK/$LOG_SUFFIX-$TIMESTAMP.done
+    echo '[ERROR]: Clone on file server was not scucessful.' > $WORK/${LOG_SUFFIX}-${TIMESTAMP}.done
 fi
 
 TIMESTAMP=$(date +%Y-%m-%d)
-echo "$TIMESTAMP" > $WORK/$LOG_SUFFIX.done
-echo "$TIMESTAMP" > $WORK_LOCAL/$LOG_SUFFIX.done
-echo "$TIMESTAMP" > $WORK_LOCAL/weekly_falcon_test_overview_done-$TIMESTAMP
+echo $TIMESTAMP > ${WORK}/${LOG_SUFFIX}.done
+echo $TIMESTAMP > ${WORK_LOCAL}/${LOG_SUFFIX}.done
+echo $TIMESTAMP > ${WORK_LOCAL}/weekly_falcon_test_overview_done-${TIMESTAMP}

Thread
bzr commit into mysql-falcon branch (hky:274) Hakan Kuecuekyilmaz20 Sep