diff options
| author | unknown <mysql@mc04.(none)> | 2004-09-16 09:21:49 +0200 |
|---|---|---|
| committer | unknown <mysql@mc04.(none)> | 2004-09-16 09:21:49 +0200 |
| commit | d159d111da398b1b1ed59a56f2357692bf2a8ab1 (patch) | |
| tree | 4607d1174b87192db3af2f5f44ecde3190fb6e87 /ndb/src/cw | |
| parent | 149b45b8f3773dbe727dcad2a81714c0a84c9576 (diff) | |
| parent | 49dc3a53011fde94b900762084cd0631cb4fb24a (diff) | |
| download | mariadb-git-d159d111da398b1b1ed59a56f2357692bf2a8ab1.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc04.(none):/space/mysql/mysql-4.1-ndb
acinclude.m4:
Auto merged
configure.in:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
sql/Makefile.am:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'ndb/src/cw')
| -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 |