Commit 9ba7f59c authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


Build-tools/Do-compile:
  Auto merged
parents 0f52fb51 5c2240e7

mysql-test/mysql-test-run.sh

+6 −6
Original line number Diff line number Diff line
@@ -1535,12 +1535,12 @@ run_testcase () 
   return

 fi



 if [ -f "$TESTDIR/$tname.disabled" ]

 then

   comment=`$CAT $TESTDIR/$tname.disabled`;

   disable_test $tname "$comment"

   return

 fi

# if [ -f "$TESTDIR/$tname.disabled" ]

# then

#   comment=`$CAT $TESTDIR/$tname.disabled`;

#   disable_test $tname "$comment"

#   return

# fi

 if [ -f "$TESTDIR/disabled.def" ] ; then

   comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;

   if [ -n "$comment" ]