summaryrefslogtreecommitdiff
path: root/mysql-test/Makefile.am
diff options
context:
space:
mode:
authorDaniel Fischer <df@sun.com>2009-03-09 11:33:08 +0100
committerDaniel Fischer <df@sun.com>2009-03-09 11:33:08 +0100
commit7a6133c77d497b632d72b4dbf752fcad18643103 (patch)
treed8dbf683dc10c8b6525106e630152ef87ef94a8a /mysql-test/Makefile.am
parenta0aa574d3140e6e1ecd67b3e2874546e3f4f7f76 (diff)
parent9c636e6beffc969fbcdafd5fa77fe516b6b9d33d (diff)
downloadmariadb-git-7a6133c77d497b632d72b4dbf752fcad18643103.tar.gz
merge from parent
Diffstat (limited to 'mysql-test/Makefile.am')
-rw-r--r--mysql-test/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 7661cba7ba4..5e3582d5e16 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -81,7 +81,7 @@ TEST_DIRS = t r include std_data std_data/parts collections \
std_data/funcs_1 \
extra/binlog_tests/ extra/rpl_tests \
suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \
- suite/bugs/data suite/bugs/t suite/bugs/r \
+ suite/bugs suite/bugs/data suite/bugs/t suite/bugs/r \
suite/federated \
suite/funcs_1 suite/funcs_1/bitdata \
suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r \
@@ -90,7 +90,7 @@ TEST_DIRS = t r include std_data std_data/parts collections \
suite/funcs_2 suite/funcs_2/charset suite/funcs_2/data \
suite/funcs_2/include suite/funcs_2/lib suite/funcs_2/r \
suite/funcs_2/t \
- suite/jp suite/jp/t suite/jp/r suite/jp/std_data \
+ suite/jp suite/jp/t suite/jp/r suite/jp/std_data suite/jp/include \
suite/manual/t suite/manual/r \
suite/ndb_team suite/ndb_team/t suite/ndb_team/r \
suite/rpl suite/rpl/data suite/rpl/include suite/rpl/r \