From 6f36a062c96cfa8e178b27f7819e58305596b2a6 Mon Sep 17 00:00:00 2001
From: unknown <kent@mysql.com>
Date: Wed, 16 Mar 2005 09:23:38 +0100
Subject: [PATCH] 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
---
 mysql-test/mysql-test-run.sh | 14 ++++++++------
 mysql-test/t/disabled.def    |  8 --------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index b69bac1ad0b..4e970ca034d 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1541,12 +1541,14 @@ run_testcase ()
    disable_test $tname "$comment"
    return
  fi
- comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;
- if [ -n "$comment" ]
- then
-   comment=`echo $comment | sed 's/^[^:]*: *//'`
-   disable_test $tname "$comment"
-   return
+ if [ -f "$TESTDIR/disabled.def" ] ; then
+   comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;
+   if [ -n "$comment" ]
+   then
+     comment=`echo $comment | sed 's/^[^:]*: *//'`
+     disable_test $tname "$comment"
+     return
+   fi
  fi
 
  if [ "x$USE_EMBEDDED_SERVER" != "x1" ] ; then
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index d2ab8158c51..9bfe9567d83 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -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
-
-- 
2.30.9