mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 00:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse source 
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).
This commit is contained in:
unknown 2005-12-22 20:06:05 -08:00
commit 2c88b6395b
10 changed files with 1077 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libmysqld/Makefile.am
View file

@ -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 \