Skip to content

M
mariadb
Commit a7ddf48f authored by msvensson@pilot.(none)'s avatar msvensson@pilot.(none)
Browse files
Options

Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
parents 119f6cb0 78349b24
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
sql/Makefile.am
View file @ a7ddf48f
...@@ -38,8 +38,7 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ ...@@ -38,8 +38,7 @@ 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) @MYSQLD_EXTRA_LIBS@
@MYSQLD_EXTRA_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 \
......
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