summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2006-11-29 22:54:11 +0200
committermonty@narttu.mysql.fi <>2006-11-29 22:54:11 +0200
commit2e8d2e3ef9d33b4404da5a62c79f4d2c0c863fb9 (patch)
tree18b0302fbd603b8209b054283333eefadcc91613 /Makefile.am
parentea5c7f975694cdf02393c67dff15a77a3590c309 (diff)
parent23263db66eb19b6779c6bd8708e1c3b08692eebb (diff)
downloadmariadb-git-2e8d2e3ef9d33b4404da5a62c79f4d2c0c863fb9.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
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 c0798fbb5c7..8a8858f9d7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
@sql_union_dirs@ unittest storage plugin \
@sql_server@ scripts @man_dirs@ tests \
netware @libmysqld_dirs@ \
- mysql-test support-files @tools_dirs@ \
+ mysql-test support-files sql-bench @tools_dirs@ \
win
DIST_SUBDIRS = $(SUBDIRS) BUILD