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 /libmysqld | |
| 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 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 2e942e7a7fc..28db9d11558 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -83,6 +83,7 @@ sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy INC_LIB= $(top_builddir)/regex/libregex.a \ $(top_builddir)/storage/myisam/libmyisam.a \ $(top_builddir)/storage/myisammrg/libmyisammrg.a \ + $(top_builddir)/storage/archive/libarchive.a \ $(top_builddir)/storage/heap/libheap.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ |