mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
f2f1e4d852
im_daemon_life_cycle fails randomly.
1. Move IM-angel functionality into a separate file, create Angel class.
2. Be more verbose;
3. Fix typo in FLUSH INSTANCES implementation;
4. Polishing.
mysql-test/r/im_options.result:
Updated result file.
mysql-test/t/im_cmd_line.imtest:
Updated test.
server-tools/instance-manager/IMService.cpp:
Move HandleServiceOptions() into IMService::main().
server-tools/instance-manager/IMService.h:
Move HandleServiceOptions() into IMService::main().
server-tools/instance-manager/Makefile.am:
Added angel.cc and angel.h.
server-tools/instance-manager/WindowsService.cpp:
Initialize class-members in constructor.
server-tools/instance-manager/WindowsService.h:
Initialize class-members in constructor.
server-tools/instance-manager/commands.cc:
Return actual error code (ER_OUT_OF_RESOURCES or ER_THERE_IS_ACTIVE_INSTANCE)
from FLUSH INSTANCES.
server-tools/instance-manager/manager.cc:
1. Return actual error code from Manager::flush_instances().
2. Be more verbose.
server-tools/instance-manager/manager.h:
Return actual error code from Manager::flush_instances().
server-tools/instance-manager/mysqlmanager.cc:
Move IM-angel functionality into separate file (angel.cc).
server-tools/instance-manager/priv.cc:
Use return bool datatype instead int{ 0, 1 }.
server-tools/instance-manager/priv.h:
Use return bool datatype instead int{ 0, 1 }.
server-tools/instance-manager/angel.cc:
IM-angel functionality.
server-tools/instance-manager/angel.h:
IM-angel functionality.
103 lines
3.4 KiB
Makefile
103 lines
3.4 KiB
Makefile
# Copyright (C) 2004 MySQL AB
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; version 2 of the License.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir)/include \
|
|
@openssl_includes@ -I$(top_builddir)/include
|
|
|
|
DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
|
|
|
|
# As all autoconf variables depend from ${prefix} and being resolved only when
|
|
# make is run, we can not put these defines to a header file (e.g. to
|
|
# default_options.h, generated from default_options.h.in)
|
|
# See automake/autoconf docs for details
|
|
|
|
noinst_LTLIBRARIES= liboptions.la
|
|
noinst_LIBRARIES= libnet.a
|
|
|
|
liboptions_la_CXXFLAGS= $(CXXFLAGS) \
|
|
-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \
|
|
-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \
|
|
-DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \
|
|
-DDEFAULT_PASSWORD_FILE_NAME="/etc/mysqlmanager.passwd" \
|
|
-DDEFAULT_MYSQLD_PATH="$(libexecdir)/mysqld$(EXEEXT)" \
|
|
-DDEFAULT_CONFIG_FILE="my.cnf" \
|
|
-DPROTOCOL_VERSION=@PROTOCOL_VERSION@
|
|
|
|
liboptions_la_SOURCES= options.h options.cc priv.h priv.cc
|
|
liboptions_la_LIBADD= $(top_builddir)/libmysql/get_password.lo
|
|
|
|
# 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
|
|
libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \
|
|
$(top_builddir)/sql/pack.$(OBJEXT) \
|
|
$(top_builddir)/sql/sql_state.$(OBJEXT) \
|
|
$(top_builddir)/sql/mini_client_errors.$(OBJEXT)\
|
|
$(top_builddir)/sql/client.$(OBJEXT)
|
|
|
|
CLEANFILES= net_serv.cc client_settings.h
|
|
|
|
net_serv.cc:
|
|
rm -f net_serv.cc
|
|
@LN_CP_F@ $(top_srcdir)/sql/net_serv.cc net_serv.cc
|
|
|
|
client_settings.h:
|
|
rm -f client_settings.h
|
|
@LN_CP_F@ $(top_srcdir)/sql/client_settings.h client_settings.h
|
|
|
|
libexec_PROGRAMS= mysqlmanager
|
|
|
|
mysqlmanager_CXXFLAGS=
|
|
|
|
mysqlmanager_SOURCES= command.cc command.h mysqlmanager.cc \
|
|
manager.h manager.cc log.h log.cc \
|
|
thread_registry.h thread_registry.cc \
|
|
listener.h listener.cc protocol.h protocol.cc \
|
|
mysql_connection.h mysql_connection.cc \
|
|
user_map.h user_map.cc \
|
|
messages.h messages.cc \
|
|
commands.h commands.cc \
|
|
instance.h instance.cc \
|
|
instance_map.h instance_map.cc\
|
|
instance_options.h instance_options.cc \
|
|
buffer.h buffer.cc parse.cc parse.h \
|
|
guardian.cc guardian.h \
|
|
parse_output.cc parse_output.h \
|
|
mysql_manager_error.h \
|
|
portability.h \
|
|
exit_codes.h \
|
|
user_management_commands.h \
|
|
user_management_commands.cc \
|
|
angel.h \
|
|
angel.cc
|
|
|
|
mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \
|
|
liboptions.la \
|
|
libnet.a \
|
|
$(top_builddir)/vio/libvio.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/strings/libmystrings.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
|
|
|
|
EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \
|
|
IMService.h CMakeLists.txt
|
|
|
|
tags:
|
|
ctags -R *.h *.cc
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|