Merge shellback.(none):/home/msvensson/mysql/bug19738/my50-bug19738

into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


sql/Makefile.am:
  Auto merged
This commit is contained in:
unknown 2006-09-20 08:57:51 +02:00
commit 33985e7562

View file

@ -27,7 +27,7 @@ INCLUDES = @ZLIB_INCLUDES@ \
WRAPLIBS= @WRAPLIBS@
SUBDIRS = share
libexec_PROGRAMS = mysqld
noinst_PROGRAMS = gen_lex_hash
EXTRA_PROGRAMS = gen_lex_hash
bin_PROGRAMS = mysql_tzinfo_to_sql
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
LDADD = $(top_builddir)/myisam/libmyisam.a \