From 6e2633e9e405aa20bb3b7100674ebdf7a421ae41 Mon Sep 17 00:00:00 2001
From: "mikron@mikael-ronstr-ms-dator.local" <>
Date: Mon, 7 May 2007 15:46:29 +0200
Subject: Manual merge

---
 sql/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/Makefile.am')

diff --git a/sql/Makefile.am b/sql/Makefile.am
index 465e5c843f4..d280b22f493 100644
--- 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@ \
-- 
cgit v1.2.1