mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
This commit is contained in:
commit
764d84852e
1 changed files with 2 additions and 1 deletions
|
@ -40,7 +40,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
|
||||||
@pstack_libs@ \
|
@pstack_libs@ \
|
||||||
@mysql_plugin_libs@ \
|
@mysql_plugin_libs@ \
|
||||||
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
|
$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
|
||||||
@yassl_libs@ @openssl_libs@
|
$(yassl_libs) $(openssl_libs)
|
||||||
|
|
||||||
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
|
noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
|
||||||
item_strfunc.h item_timefunc.h \
|
item_strfunc.h item_timefunc.h \
|
||||||
item_xmlfunc.h \
|
item_xmlfunc.h \
|
||||||
|
|
Loading…
Reference in a new issue