Commit b1ddf9a3 authored by unknown's avatar unknown

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

into  shellback.(none):/home/msvensson/mysql/bug19738/my51-bug19738


sql/Makefile.am:
  Auto merged
parents 5b31e792 b09dc35e
......@@ -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)/vio/libvio.a \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment