Manual merge

6e2633e9 · mikron@mikael-ronstr-ms-dator.local · 8a83924e · 6e2633e9
Commit 6e2633e9 authored May 07, 2007 by mikron@mikael-ronstr-ms-dator.local
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -33,7 +33,7 @@ SUPPORTING_LIBS =	$(top_builddir)/vio/libvio.a \
 			$(top_builddir)/regex/libregex.a \
 			$(top_builddir)/strings/libmystrings.a
 mysqld_DEPENDENCIES=	@mysql_plugin_libs@ $(SUPPORTING_LIBS)
-LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@
+LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
 mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
 			@pstack_libs@ \
 			@mysql_plugin_libs@ \