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

into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
a7ddf48f · msvensson@pilot.(none) · 119f6cb0 · 78349b24 · a7ddf48f
Commit a7ddf48f authored Jun 28, 2007 by msvensson@pilot.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sql/Makefile.am sql/Makefile.am +1 -2

No files found.
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -38,8 +38,7 @@ mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
 			@pstack_libs@ \
 			@mysql_plugin_libs@ \
 			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
-			$(yassl_libs) $(openssl_libs) \
-			@MYSQLD_EXTRA_LIBS@
+			$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@

 noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			item_strfunc.h item_timefunc.h \