database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge

Browse Source 
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
This commit is contained in:
unknown
2006-02-12 20:45:03 +01:00
parent 0dbf883aee 0d4cae389d
commit 4ffb392628
14 changed files with 198 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server-tools/instance-manager/Makefile.am
View File

@ -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 \