summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorjimw@mysql.com <>2006-04-13 10:37:57 -0700
committerjimw@mysql.com <>2006-04-13 10:37:57 -0700
commit66c29e0f498ed5f91da4dda8b51de28f790ba043 (patch)
tree6e8a46e592c3904f889bb457121f5350fbcf5661 /Makefile.am
parent3b145bee576eb67fd9483e7f60da4412f565b271 (diff)
parent55727ef6d0db4b5aec48223f9618c2da3d36f989 (diff)
downloadmariadb-git-66c29e0f498ed5f91da4dda8b51de28f790ba043.tar.gz
Merge mysql.com:/home/jimw/my/mysql-5.1-clean
into mysql.com:/home/jimw/my/mysql-5.1-kill-sql-bench
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 923fe946702..dbf43151d60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
@sql_server@ scripts @man_dirs@ tests \
@mysql_se_plugins@ \
netware @libmysqld_dirs@ \
- @bench_dirs@ support-files @tools_dirs@ \
+ mysql-test support-files @tools_dirs@ \
plugin unittest win
DIST_SUBDIRS = $(SUBDIRS) BUILD