summaryrefslogtreecommitdiff
path: root/libmysqld/Makefile.am
diff options
context:
space:
mode:
authormikron@mikael-ronstr-ms-dator.local <>2007-05-07 15:39:36 +0200
committermikron@mikael-ronstr-ms-dator.local <>2007-05-07 15:39:36 +0200
commit8a83924eb6bbccbec309807a26c803f74bcb4bfc (patch)
tree74e4d9d386e521284ecc05b8002379d9056c7a82 /libmysqld/Makefile.am
parent5f9d1cf77c5e44e55e7f87d3fe91a29f64d8b505 (diff)
parentad11366a2fc42f7cda0d2502c7adac45d599ecd7 (diff)
downloadmariadb-git-8a83924eb6bbccbec309807a26c803f74bcb4bfc.tar.gz
Merge mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.0-ndb
into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/mysql-5.1-ndb
Diffstat (limited to 'libmysqld/Makefile.am')
-rw-r--r--libmysqld/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index cf5971affe4..024b85eed8e 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -95,6 +95,7 @@ INC_LIB= $(top_builddir)/regex/libregex.a \
$(top_builddir)/strings/libmystrings.a \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/vio/libvio.a \
+ @NDB_SCI_LIBS@ \
@mysql_plugin_libs@ \
$(yassl_inc_libs)