diff options
| author | unknown <monty@mysql.com> | 2005-03-16 12:03:00 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-03-16 12:03:00 +0200 |
| commit | bfe19493c5c8c4f4a9e394091f79a9e569382333 (patch) | |
| tree | 73cf226453a2858770b14a9d4645880b61832453 /mysql-test | |
| parent | 008458762058f40f58c0712eb404f2f6a4d06a0f (diff) | |
| parent | 97a281f5177259b3621e69619d8c033310973749 (diff) | |
| download | mariadb-git-bfe19493c5c8c4f4a9e394091f79a9e569382333.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 14 | ||||
| -rw-r--r-- | 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 - |