summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorjimw@mysql.com <>2006-04-13 10:34:46 -0700
committerjimw@mysql.com <>2006-04-13 10:34:46 -0700
commit55727ef6d0db4b5aec48223f9618c2da3d36f989 (patch)
tree0a79040513002b1077bf7cde2601476cd8f5493c /Makefile.am
parent86d6b16113715a9b7e94658b6ca356e8899032fa (diff)
downloadmariadb-git-55727ef6d0db4b5aec48223f9618c2da3d36f989.tar.gz
Remove sql-bench from the server repository -- it is being maintained
in a distinct mysql-bench repository. Also add a new --benchdir option to mysql-test-run.pl so the location of the mysql-bench repository can be specified. The default location is adjacent to the source tree.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index cc6cd7da8ce..93cfd6bc827 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_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 win
DIST_SUBDIRS = . include @docs_dirs@ zlib \
@@ -38,7 +38,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \
vio sql libmysql_r libmysql client scripts \
@man_dirs@ tests \
BUILD netware @libmysqld_dirs@\
- @bench_dirs@ support-files server-tools \
+ support-files server-tools \
plugin win
# Run these targets before any others, also make part of clean target,