Commit 6f36a062 authored by unknown's avatar unknown
Browse files

mysql-test-run.sh: 

  Check that there is a disabled.def before using it
disabled.def:
  Reenable ndb tests accidently disabled


mysql-test/t/disabled.def:
  Reenable ndb tests accidently disabled
mysql-test/mysql-test-run.sh:
  Check that there is a disabled.def before using it
parent 8c45e43e

mysql-test/mysql-test-run.sh

+8 −6
Original line number Diff line number Diff line
@@ -1541,6 +1541,7 @@ run_testcase () 
   disable_test $tname "$comment"

   return

 fi

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

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

   if [ -n "$comment" ]

   then
@@ -1548,6 +1549,7 @@ run_testcase () 
     disable_test $tname "$comment"

     return

   fi

 fi



 if [ "x$USE_EMBEDDED_SERVER" != "x1" ] ; then

   # Stop all slave threads, so that we don't have useless reconnection

mysql-test/t/disabled.def

+0 −8
Original line number Diff line number Diff line
@@ -10,11 +10,3 @@ 
#

##############################################################################

ndb_alter_table   : NDB team needs to fix

ndb_autodiscover  : NDB team needs to fix

ndb_autodiscover2 : NDB team needs to fix

ndb_cache_multi   : NDB team needs to fix

ndb_cache_multi2  : NDB team needs to fix

ndb_multi         : NDB team needs to fix

ndb_restore       : NDB team needs to fix