diff options
| author | unknown <mronstrom@mysql.com> | 2004-08-25 10:28:49 +0200 |
|---|---|---|
| committer | unknown <mronstrom@mysql.com> | 2004-08-25 10:28:49 +0200 |
| commit | 64a5170be614044e1afd01cc13dc6ac5505a27aa (patch) | |
| tree | 4b29c4e5df190c114800e5999457e4d7e87d4096 /ndb/src/mgmclient | |
| parent | c6216b12f3497d705b0e23f0e5835cd57d441271 (diff) | |
| parent | 777cd0e347d890d31b9c3231e87cf49e13afc6e4 (diff) | |
| download | mariadb-git-64a5170be614044e1afd01cc13dc6ac5505a27aa.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/Volumes/Backup1/wl2056
BitKeeper/etc/logging_ok:
auto-union
ndb/src/common/mgmcommon/ConfigInfo.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
Diffstat (limited to 'ndb/src/mgmclient')
| -rw-r--r-- | ndb/src/mgmclient/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ndb/src/mgmclient/Makefile.am b/ndb/src/mgmclient/Makefile.am index f3eaaaa68bd..72ddc9d098b 100644 --- a/ndb/src/mgmclient/Makefile.am +++ b/ndb/src/mgmclient/Makefile.am @@ -13,6 +13,9 @@ INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/common/mg LDADD_LOC = $(top_builddir)/ndb/src/libndbclient.la \ $(top_builddir)/ndb/src/common/editline/libeditline.a \ + $(top_builddir)/dbug/libdbug.a \ + $(top_builddir)/mysys/libmysys.a \ + $(top_builddir)/strings/libmystrings.a \ @TERMCAP_LIB@ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@ |