diff options
| author | unknown <brian@zim.(none)> | 2005-12-22 20:06:05 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-12-22 20:06:05 -0800 |
| commit | 2c88b6395b6343a3849ef0d3cb932ce7f9c282d3 (patch) | |
| tree | c40d75178198f63434dbb904677d9fa2411ab2de /storage/Makefile.am | |
| parent | 2f7d04166534c7ac7962096045136385cf573703 (diff) | |
| parent | 93b3d4efc6c172b1cbc5cca35fa9b10a1aa12fb5 (diff) | |
| download | mariadb-git-2c88b6395b6343a3849ef0d3cb932ce7f9c282d3.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.(none):/home/brian/mysql/archive-5.1
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_archive.cc:
Auto merged
storage/Makefile.am:
Hand merge of the Makefile.am changes (I assume Antony pushed loadable).
Diffstat (limited to 'storage/Makefile.am')
| -rw-r--r-- | storage/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/Makefile.am b/storage/Makefile.am index 7b6f50b4f33..95c49b50890 100644 --- a/storage/Makefile.am +++ b/storage/Makefile.am @@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = foreign # These are built from source in the Docs directory EXTRA_DIST = SUBDIRS = -DIST_SUBDIRS = . csv example bdb heap innobase myisam myisammrg ndb +DIST_SUBDIRS = . csv example bdb heap innobase myisam myisammrg ndb archive # Don't update the files from bitkeeper %::SCCS/s.% |