summaryrefslogtreecommitdiff
path: root/mysql-test/t/ndb_autodiscover.test
diff options
context:
space:
mode:
authorChad MILLER <chad@mysql.com>2009-04-14 13:20:13 -0400
committerChad MILLER <chad@mysql.com>2009-04-14 13:20:13 -0400
commit14f923c0286588f9f391a2fda8b9fab5a4e2953c (patch)
tree55596b47965261462217616f8271d0c2b9d79ab0 /mysql-test/t/ndb_autodiscover.test
parent9d7f61dc698ee6b1dd379cc5820c59b8a9806c2d (diff)
parentbd2db28cdad7e715b9efcee2f440f432a0562e8f (diff)
downloadmariadb-git-14f923c0286588f9f391a2fda8b9fab5a4e2953c.tar.gz
Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.
Diffstat (limited to 'mysql-test/t/ndb_autodiscover.test')
-rw-r--r--mysql-test/t/ndb_autodiscover.test6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/ndb_autodiscover.test b/mysql-test/t/ndb_autodiscover.test
index dc450aeb9cf..73c04ad6764 100644
--- a/mysql-test/t/ndb_autodiscover.test
+++ b/mysql-test/t/ndb_autodiscover.test
@@ -1,6 +1,12 @@
-- source include/have_ndb.inc
-- source include/not_embedded.inc
+# Bug#41308: Test main.ndb_autodiscover.test doesn't work on Windows due
+# to 'grep' calls
+# Test is currently disabled on Windows via the next line until this bug
+# can be resolved.
+--source include/not_windows.inc
+
--disable_warnings
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
--enable_warnings