Commit 094db702 authored by unknown's avatar unknown
Browse files

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

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


sql/Makefile.am:
  Auto merged
parents 7c152303 780e60af

sql/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ 
			@pstack_libs@ \

			@mysql_plugin_libs@ \

			$(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 \

			item_strfunc.h item_timefunc.h \

			item_xmlfunc.h \