diff options
| author | unknown <mikron@mikael-ronstr-ms-dator.local> | 2007-05-07 15:39:36 +0200 |
|---|---|---|
| committer | unknown <mikron@mikael-ronstr-ms-dator.local> | 2007-05-07 15:39:36 +0200 |
| commit | 1f07de22e097c6e32b29042ba45c66b2293ce952 (patch) | |
| tree | 74e4d9d386e521284ecc05b8002379d9056c7a82 /libmysqld | |
| parent | a33d5e1755c9b6dc6839632240adf3454fa959f8 (diff) | |
| parent | b95356601151b10a695b5b9a44bd49ddeac7e433 (diff) | |
| download | mariadb-git-1f07de22e097c6e32b29042ba45c66b2293ce952.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
BUILD/Makefile.am:
Auto merged
config/ac-macros/ha_ndbcluster.m4:
Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.hpp:
Auto merged
libmysqld/Makefile.am:
Manual merge
libmysqld/examples/Makefile.am:
Manual merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 1 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 3 |
2 files changed, 3 insertions, 1 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) diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 3e4769c564d..ec5bbbb86e5 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -36,7 +36,8 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \ -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ $(openssl_includes) LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs) -LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) +LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \ + @NDB_SCI_LIBS@ mysqltest_embedded_LINK = $(CXXLINK) mysqltest_embedded_SOURCES = mysqltest.c |