Skip to content

M
mariadb
Commit 764d8485 authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com
Browse files
Options

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
parents 5d744adc eee38fed
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
sql/Makefile.am
View file @ 764d8485
...@@ -40,7 +40,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ ...@@ -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 \
......
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