diff options
| author | unknown <mysql@mc04.(none)> | 2004-09-20 14:20:01 +0200 |
|---|---|---|
| committer | unknown <mysql@mc04.(none)> | 2004-09-20 14:20:01 +0200 |
| commit | 710b19349b79aad600f87de4c6da6244ff37a6fb (patch) | |
| tree | 5fc51f84bc7cb84d221ac0cb747915f6483397bc /ndb/src/cw/cpcd | |
| parent | b7908030408b29dc1b8c109c38b65f58aec8b793 (diff) | |
| parent | 4f49ca3d59b0fe56ef35f79c06b2caf5e1a23be7 (diff) | |
| download | mariadb-git-710b19349b79aad600f87de4c6da6244ff37a6fb.tar.gz | |
Hand merge
acinclude.m4:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
Diffstat (limited to 'ndb/src/cw/cpcd')
| -rw-r--r-- | ndb/src/cw/cpcd/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/cw/cpcd/Makefile.am b/ndb/src/cw/cpcd/Makefile.am index e276d1a766d..6af44a359fc 100644 --- a/ndb/src/cw/cpcd/Makefile.am +++ b/ndb/src/cw/cpcd/Makefile.am @@ -7,7 +7,7 @@ LDADD_LOC = \ $(top_builddir)/ndb/src/libndbclient.la \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a + $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ include $(top_srcdir)/ndb/config/common.mk.am include $(top_srcdir)/ndb/config/type_util.mk.am |