Skip to content

M
MariaDB
Commit 33985e75 authored by unknown's avatar unknown
Browse files
Options

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

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


sql/Makefile.am:
  Auto merged
parents 4cb97ad7 a1162588
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sql/Makefile.am
View file @ 33985e75
...@@ -27,7 +27,7 @@ INCLUDES = @ZLIB_INCLUDES@ \ ...@@ -27,7 +27,7 @@ INCLUDES = @ZLIB_INCLUDES@ \
WRAPLIBS= @WRAPLIBS@ WRAPLIBS= @WRAPLIBS@
SUBDIRS = share SUBDIRS = share
libexec_PROGRAMS = mysqld libexec_PROGRAMS = mysqld
noinst_PROGRAMS = gen_lex_hash EXTRA_PROGRAMS = gen_lex_hash
bin_PROGRAMS = mysql_tzinfo_to_sql bin_PROGRAMS = mysql_tzinfo_to_sql
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
LDADD = $(top_builddir)/myisam/libmyisam.a \ LDADD = $(top_builddir)/myisam/libmyisam.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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7