diff options
| author | unknown <mats@mysql.com> | 2006-04-13 17:48:53 +0200 |
|---|---|---|
| committer | unknown <mats@mysql.com> | 2006-04-13 17:48:53 +0200 |
| commit | da721dec0a3625cc98bb9b0b9aca386bd02b5336 (patch) | |
| tree | 2061e19dae844e077b058a2bcb01669d521c5b18 /Makefile.am | |
| parent | ae040f25312501c62afd84d946d842dc10d9aabd (diff) | |
| parent | 24caba3aefc37bec6a7d2bc63e46c98a6ba6b0c1 (diff) | |
| download | mariadb-git-da721dec0a3625cc98bb9b0b9aca386bd02b5336.tar.gz | |
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/bkroot/mysql-5.1-new
configure.in:
Auto merged
Makefile.am:
Merge with mysql-5.1-new
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 7fbb5fd5b51..923fe946702 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \ @mysql_se_plugins@ \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @tools_dirs@ \ - plugin win + plugin unittest win DIST_SUBDIRS = $(SUBDIRS) BUILD |