mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
26b6b1b2a2
BitKeeper/deleted/.del-factory.h~c1679505d3a6dd53:
Delete: server-tools/instance-manager/factory.h
BitKeeper/deleted/.del-factory.cc~6836cccd4cd35b4d:
Delete: server-tools/instance-manager/factory.cc
server-tools/instance-manager/Makefile.am:
- remove Commands_factory: it'll be needed when we add support
for NNTP/HTTP connections, currently it only adds unnecessary
complexity.
server-tools/instance-manager/commands.cc:
- fix coding style: no else after return; fix comments, make
one place a bit faster.
server-tools/instance-manager/guardian.cc:
- fix coding style and comments.
- we must register the current thread in the thread registry
before entering pthread_cond_timedwait, because at shutdown
the thread registry will try to kick out of wait all blocked
threads. Unregistered threads are not awakened by the registry.
This fixes the failinig assert in Thread_registry::~Thread_registry
at shutdown, when shutdown is requested and there is an
instance monitored by Guardian.
server-tools/instance-manager/guardian.h:
- fix coding style: enums must start with enum_
server-tools/instance-manager/instance.h:
- move comment to the variable it comments
server-tools/instance-manager/instance_map.cc:
- cleanup
server-tools/instance-manager/instance_options.cc:
- cleanup; no else after return (fix coding style).
server-tools/instance-manager/manager.cc:
- fix alignment; make some code easier to read.
server-tools/instance-manager/mysql_connection.cc:
- remove Commands_factory
server-tools/instance-manager/options.cc:
- fix a possible crash when the instance manager is started with
--no-defaults --defaults-file=~/.my.cnf: if we return
without cloning saved_argv by calling load_defaults, Options::cleanup
will crash on attempt to free_defaults(saved_argv);
server-tools/instance-manager/parse.cc:
- get rid of Commands_factory
server-tools/instance-manager/parse.h:
- get rid of Commands_factory
server-tools/instance-manager/parse_output.cc:
- in parse_output_and_get_value return error also if the specified
pattern was not found, or the command failed to execute.
server-tools/instance-manager/portability.h:
- fix coding style (// comments are allowed only at ends of lines)
server-tools/instance-manager/thread_registry.cc:
- implement Thread_registry::cond_timedwait
server-tools/instance-manager/thread_registry.h:
- implement Thread_registry::cond_timedwait; remove
unused out parameter from Thread_registry::cond_wait.
server-tools/instance-manager/user_map.cc:
- safety: newline can take 2 bytes.
95 lines
3.3 KiB
Makefile
95 lines
3.3 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; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# 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_LIBRARIES= liboptions.a libnet.a
|
|
|
|
liboptions_a_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="$(sysconfdir)/mysqlmanager.passwd" \
|
|
-DDEFAULT_MYSQLD_PATH="$(libexecdir)/mysqld$(EXEEXT)" \
|
|
-DDEFAULT_MONITORING_INTERVAL="20" \
|
|
-DDEFAULT_PORT="2273" \
|
|
-DDEFAULT_CONFIG_FILE="/etc/my.cnf" \
|
|
-DPROTOCOL_VERSION=@PROTOCOL_VERSION@
|
|
|
|
liboptions_a_SOURCES= options.h options.cc priv.h priv.cc
|
|
liboptions_a_LIBADD= $(top_builddir)/libmysql/get_password.$(OBJEXT)
|
|
|
|
# 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 $(srcdir)/net_serv.cc
|
|
@LN_CP_F@ $(top_srcdir)/sql/net_serv.cc $(srcdir)/net_serv.cc
|
|
|
|
client_settings.h:
|
|
rm -f $(srcdir)/client_settings.h
|
|
@LN_CP_F@ $(top_srcdir)/sql/client_settings.h $(srcdir)/client_settings.h
|
|
|
|
libexec_PROGRAMS= mysqlmanager
|
|
|
|
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
|
|
|
|
mysqlmanager_LDADD= liboptions.a \
|
|
libnet.a \
|
|
$(top_builddir)/vio/libvio.a \
|
|
$(top_builddir)/mysys/libmysys.a \
|
|
$(top_builddir)/strings/libmystrings.a \
|
|
$(top_builddir)/dbug/libdbug.a \
|
|
@openssl_libs@ @ZLIB_LIBS@
|
|
|
|
|
|
tags:
|
|
ctags -R *.h *.cc
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|