diff options
| author | unknown <kent@mysql.com> | 2006-02-12 20:45:03 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-02-12 20:45:03 +0100 |
| commit | 4ffb392628e07b80f3f5ba0940cf7ed542053587 (patch) | |
| tree | cf82c3578299f7628234c016f832938afdc6db27 /server-tools | |
| parent | 0dbf883aee05d9ce4a42d5a1be723fb5bdd5002f (diff) | |
| parent | 0d4cae389d37017123950a930516a442e27f529e (diff) | |
| download | mariadb-git-4ffb392628e07b80f3f5ba0940cf7ed542053587.tar.gz | |
Merge
include/config-netware.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
netware/BUILD/compile-AUTOTOOLS:
Auto merged
netware/Makefile.am:
Auto merged
netware/my_manage.h:
Auto merged
netware/mysql_test_run.c:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
netware/BUILD/mwenv:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/innobase/include/univ.i:
Auto merged
storage/innobase/os/os0thread.c:
Auto merged
storage/myisam/mi_locking.c:
Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 5b9690322aa..043a0336b93 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -77,7 +77,8 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ mysql_manager_error.h \ portability.h -mysqlmanager_LDADD= liboptions.a \ +mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \ + liboptions.a \ libnet.a \ $(top_builddir)/vio/libvio.a \ $(top_builddir)/mysys/libmysys.a \ |