summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2006-11-29 22:51:09 +0200
committermonty@mysql.com/narttu.mysql.fi <>2006-11-29 22:51:09 +0200
commit23263db66eb19b6779c6bd8708e1c3b08692eebb (patch)
treed9287bcf6cac6fec1a2d75f4ea0cb4afc3e6926f /Makefile.am
parent93f246d4c196d813f3870586534372d13b51fb03 (diff)
downloadmariadb-git-23263db66eb19b6779c6bd8708e1c3b08692eebb.tar.gz
Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option) Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file" BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
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 a0d19e8271d..4ab93251836 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