Commit 0eb9947c authored by joreland@mysql.com's avatar joreland@mysql.com

merge

parent 4d1804eb
...@@ -6,7 +6,6 @@ include $(top_srcdir)/ndb/config/type_util.mk.am ...@@ -6,7 +6,6 @@ include $(top_srcdir)/ndb/config/type_util.mk.am
include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
test_PROGRAMS = atrt test_PROGRAMS = atrt
test_DATA=daily-basic-tests.txt daily-devel-tests.txt
test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \ test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \
conf-daily-basic-ndbmaster.txt \ conf-daily-basic-ndbmaster.txt \
conf-daily-basic-shark.txt \ conf-daily-basic-shark.txt \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment