diff options
| author | unknown <petr@mysql.com> | 2004-11-15 14:53:30 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2004-11-15 14:53:30 +0300 |
| commit | b5536bb962da6751bbc62ef9b7aba720bb04d018 (patch) | |
| tree | 4f67353d223119e5cffbf410803e0fb99d8d7d94 /server-tools/instance-manager/Makefile.am | |
| parent | 0157ffa5fd491b886586dbb0236fef8ae0af4d49 (diff) | |
| download | mariadb-git-b5536bb962da6751bbc62ef9b7aba720bb04d018.tar.gz | |
Some minor IM fixes
server-tools/instance-manager/Makefile.am:
Makefile.am cleanup
server-tools/instance-manager/commands.cc:
cleanup
server-tools/instance-manager/instance_map.cc:
fix the problem caused thread deadlock (as load ends up in the find()
call which now also locks an instance map mutex)
server-tools/instance-manager/listener.cc:
portability fix
server-tools/instance-manager/manager.cc:
Ignore SIGPIPE
server-tools/instance-manager/mysqlmanager.cc:
cleanup
server-tools/instance-manager/options.cc:
options renamed
Diffstat (limited to 'server-tools/instance-manager/Makefile.am')
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index d3702ba9464..050f9b9bfd2 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -42,25 +42,19 @@ liboptions_a_SOURCES= options.h options.cc priv.h priv.cc # MySQL sometimes uses symlinks to reuse code # All symlinked files are grouped in libnet.a -nodist_libnet_a_SOURCES= net_serv.cc client_settings.h client.c errmsg.c +nodist_libnet_a_SOURCES= net_serv.cc client_settings.h libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \ $(top_builddir)/sql/pack.$(OBJEXT) \ - $(top_builddir)/sql/sql_state.$(OBJEXT) + $(top_builddir)/sql/sql_state.$(OBJEXT) \ + $(top_builddir)/sql/mini_client_errors.$(OBJEXT)\ + $(top_builddir)/sql/client.$(OBJEXT) -CLEANFILES= net_serv.cc client.c client_settings.h errmsg.c +CLEANFILES= net_serv.cc client_settings.h net_serv.cc: Makefile rm -f $(srcdir)/net_serv.cc @LN_CP_F@ $(top_srcdir)/sql/net_serv.cc $(srcdir)/net_serv.cc -client.c: Makefile - rm -f $(srcdir)/client.c - @LN_CP_F@ $(top_srcdir)/sql-common/client.c $(srcdir)/client.c - -errmsg.c: Makefile - rm -f $(srcdir)/errmsg.c - @LN_CP_F@ $(top_srcdir)/libmysql/errmsg.c $(srcdir)/errmsg.c - client_settings.h: Makefile rm -f $(srcdir)/client_settings.h @LN_CP_F@ $(top_srcdir)/sql/client_settings.h $(srcdir)/client_settings.h @@ -74,7 +68,6 @@ mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \ mysql_connection.h mysql_connection.cc \ user_map.h user_map.cc \ messages.h messages.cc \ - $(top_srcdir)/sql/sql_string.cc \ commands.h commands.cc \ factory.h factory.cc \ instance.h instance.cc \ |