diff options
| author | unknown <monty@narttu.mysql.fi> | 2006-11-29 22:54:11 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2006-11-29 22:54:11 +0200 |
| commit | 6bcbd7df1e3402fbc8b6730868115a2bb253f7a7 (patch) | |
| tree | 18b0302fbd603b8209b054283333eefadcc91613 /Makefile.am | |
| parent | 8f71610f9cd13fafdfd764da5554532b2624e215 (diff) | |
| parent | ee1c5226b9758648c1b699e4a0ebe9c1d3f4bf30 (diff) | |
| download | mariadb-git-6bcbd7df1e3402fbc8b6730868115a2bb253f7a7.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
Makefile.am:
Auto merged
configure.in:
Auto merged
sql/field.h:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
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 |