1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


sql/Makefile.am:
  Auto merged
This commit is contained in:
unknown 2007-02-07 15:11:19 +01:00
commit 094db7029e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/Makefile.am
View File

@ -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 \