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 | dbf87bf89915eb0200f43c9bdf47d08ddc4f83ec (patch) | |
| tree | 5fc51f84bc7cb84d221ac0cb747915f6483397bc /ndb/test | |
| parent | 7f1fcf6648c6c4a29b94360fd47f53e90812cb98 (diff) | |
| parent | 48e56f47a62829480803a7bdfe46d6ebbea17c47 (diff) | |
| download | mariadb-git-dbf87bf89915eb0200f43c9bdf47d08ddc4f83ec.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/test')
| -rw-r--r-- | ndb/test/run-test/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/test/run-test/Makefile.am b/ndb/test/run-test/Makefile.am index 03b53509f05..3bf2edde47a 100644 --- a/ndb/test/run-test/Makefile.am +++ b/ndb/test/run-test/Makefile.am @@ -16,7 +16,7 @@ LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CpcClient.o \ $(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@ wrappersdir=$(prefix)/bin wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run |