mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 15:54:37 +01:00
8b4fcf6e3b
- WL#3158: IM: Instance configuration extensions; - WL#3159: IM: --bootstrap and --start-default-instance modes The following new statements have been added: - CREATE INSTANCE; - DROP INSTANCE; The behaviour of the following statements have been changed: - SET; - UNSET; - FLUSH INSTANCES; - SHOW INSTANCES; - SHOW INSTANCE OPTIONS; BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Delete: mysql-test/t/im_options_set.imtest BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Delete: mysql-test/r/im_options_set.result BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Delete: mysql-test/t/im_options_unset.imtest BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Delete: mysql-test/r/im_options_unset.result client/get_password.c: Change prototype to avoid casting when using C-strings (char *). include/m_string.h: Moved LEX_STRING to global header from sql/ to be accessible from all components (IM for one). include/my_sys.h: Added constants for modify_defaults_file(). include/mysql_com.h: Removed duplicated declarations. my_sys.h should be used instead. libmysql/get_password.c: Change prototype to avoid casting when using C-strings (char *). mysql-test/mysql-test-run.pl: Added environment variables to be used from tests. mysql-test/r/im_daemon_life_cycle.result: Column name has been changed in SHOW INSTANCES. mysql-test/r/im_life_cycle.result: 1. Column name has been changed in SHOW INSTANCES. 2. Removed redundant SHOW INSTANCE STATUS statements. mysql-test/r/im_utils.result: Updated the result file. mysql-test/t/im_daemon_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_daemon_life_cycle.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysql-test/t/im_life_cycle.imtest: 1. Polishing; 2. Fixed a test error in 1.1.2. mysql-test/t/im_utils.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysys/default.c: Pass the name of the section to the handler function as well. mysys/default_modify.c: Added REMOVE_SECTION functionality. server-tools/instance-manager/IMService.cpp: Polishing: be more verbose. server-tools/instance-manager/IMService.h: Polishing: added copyright. server-tools/instance-manager/Makefile.am: Added new files. server-tools/instance-manager/WindowsService.cpp: Polishing: according to The Coding Style, TRUE/FALSE must be used instead of true/false. server-tools/instance-manager/WindowsService.h: Polishing: added copyright. server-tools/instance-manager/command.h: Polishing: provide a comment for the main operation of "Command" class. server-tools/instance-manager/commands.cc: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/commands.h: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/guardian.cc: Added operations to retrieve state of managed instances. server-tools/instance-manager/guardian.h: Added operations to retrieve state of managed instances. server-tools/instance-manager/instance.cc: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance.h: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance_map.cc: 1. Used the operation to check validity of instance name; 2. Added operations to manage instances. server-tools/instance-manager/instance_map.h: Added operations to manage instances. server-tools/instance-manager/instance_options.cc: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/instance_options.h: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/listener.cc: 1. Remove reference to the instance of Options; 2. Use new Options naming scheme. server-tools/instance-manager/listener.h: Remove reference to the instance of Options; server-tools/instance-manager/log.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/manager.cc: Added a common for IM operation to work with configuration file. server-tools/instance-manager/manager.h: Added a common for IM operation to work with configuration file. server-tools/instance-manager/messages.cc: Added messages for new errors. server-tools/instance-manager/mysql_connection.cc: 1. Move a constant to common place. 2. Polishing. server-tools/instance-manager/mysql_manager_error.h: Added new errors. server-tools/instance-manager/mysqlmanager.cc: 1. Use error code from Options::load(); 2. Eliminate type-casting warning on Windows. server-tools/instance-manager/options.cc: Added support for user-management command-line options. server-tools/instance-manager/options.h: Added support for user-management command-line options. server-tools/instance-manager/parse.cc: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse.h: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse_output.cc: Sorted out header files. server-tools/instance-manager/parse_output.h: Sorted out header files. server-tools/instance-manager/portability.h: 1. Added constants for Windows. 2. Moved system-dependent defines from instance_options.cc. server-tools/instance-manager/priv.cc: Updated version. server-tools/instance-manager/priv.h: Added some global constants. server-tools/instance-manager/protocol.cc: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/protocol.h: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/thread_registry.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/user_map.cc: Added support for managing password database. server-tools/instance-manager/user_map.h: Added support for managing password database. sql/sp.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/sp_head.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/spatial.cc: Removed LEX_STRING_WITH_INIT. sql/spatial.h: Removed LEX_STRING_WITH_INIT. sql/sql_string.h: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/sql_trigger.cc: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/structs.h: Removed LEX_STRING_WITH_INIT. support-files/mysql.server.sh: Instruct Instance Manager to work in mysqld-safe compatible mode for backward compatibility. mysql-test/r/im_cmd_line.result: Added result file. mysql-test/r/im_instance_conf.result: Added result file. mysql-test/r/im_options.result: Added result file. mysql-test/t/im_cmd_line.imtest: IM command-line options test. mysql-test/t/im_instance_conf-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_instance_conf.imtest: Added a new test case for checking instance-management. mysql-test/t/im_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_options.imtest: Join im_options_set and im_options_unset and add new tests. mysql-test/t/im_utils-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. server-tools/instance-manager/exit_codes.h: New file for defining exit codes for user-management mode. server-tools/instance-manager/user_management_commands.cc: User-management commands implementation. server-tools/instance-manager/user_management_commands.h: User-management command declarations.
351 lines
8.7 KiB
Bash
351 lines
8.7 KiB
Bash
#!/bin/sh
|
|
# Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB
|
|
# This file is public domain and comes with NO WARRANTY of any kind
|
|
|
|
# MySQL daemon start/stop script.
|
|
|
|
# Usually this is put in /etc/init.d (at least on machines SYSV R4 based
|
|
# systems) and linked to /etc/rc3.d/S99mysql and /etc/rc0.d/K01mysql.
|
|
# When this is done the mysql server will be started when the machine is
|
|
# started and shut down when the systems goes down.
|
|
|
|
# Comments to support chkconfig on RedHat Linux
|
|
# chkconfig: 2345 64 36
|
|
# description: A very fast and reliable SQL database engine.
|
|
|
|
# Comments to support LSB init script conventions
|
|
### BEGIN INIT INFO
|
|
# Provides: mysql
|
|
# Required-Start: $local_fs $network $remote_fs
|
|
# Required-Stop: $local_fs $network $remote_fs
|
|
# Default-Start: 2 3 4 5
|
|
# Default-Stop: 0 1 6
|
|
# Short-Description: start and stop MySQL
|
|
# Description: MySQL is a very fast and reliable SQL database engine.
|
|
### END INIT INFO
|
|
|
|
# If you install MySQL on some other places than @prefix@, then you
|
|
# have to do one of the following things for this script to work:
|
|
#
|
|
# - Run this script from within the MySQL installation directory
|
|
# - Create a /etc/my.cnf file with the following information:
|
|
# [mysqld]
|
|
# basedir=<path-to-mysql-installation-directory>
|
|
# - Add the above to any other configuration file (for example ~/.my.ini)
|
|
# and copy my_print_defaults to /usr/bin
|
|
# - Add the path to the mysql-installation-directory to the basedir variable
|
|
# below.
|
|
#
|
|
# If you want to affect other MySQL variables, you should make your changes
|
|
# in the /etc/my.cnf, ~/.my.cnf or other MySQL configuration files.
|
|
|
|
# If you change base dir, you must also change datadir. These may get
|
|
# overwritten by settings in the MySQL configuration files.
|
|
|
|
basedir=
|
|
datadir=
|
|
|
|
# The following variables are only set for letting mysql.server find things.
|
|
|
|
# Set some defaults
|
|
pid_file=
|
|
server_pid_file=
|
|
use_mysqld_safe=1
|
|
user=@MYSQLD_USER@
|
|
if test -z "$basedir"
|
|
then
|
|
basedir=@prefix@
|
|
bindir=@bindir@
|
|
if test -z "$datadir"
|
|
then
|
|
datadir=@localstatedir@
|
|
fi
|
|
sbindir=@sbindir@
|
|
libexecdir=@libexecdir@
|
|
else
|
|
bindir="$basedir/bin"
|
|
if test -z "$datadir"
|
|
then
|
|
datadir="$basedir/data"
|
|
fi
|
|
sbindir="$basedir/sbin"
|
|
libexecdir="$basedir/libexec"
|
|
fi
|
|
|
|
# datadir_set is used to determine if datadir was set (and so should be
|
|
# *not* set inside of the --basedir= handler.)
|
|
datadir_set=
|
|
|
|
#
|
|
# Use LSB init script functions for printing messages, if possible
|
|
#
|
|
lsb_functions="/lib/lsb/init-functions"
|
|
if test -f $lsb_functions ; then
|
|
source $lsb_functions
|
|
else
|
|
log_success_msg()
|
|
{
|
|
echo " SUCCESS! $@"
|
|
}
|
|
log_failure_msg()
|
|
{
|
|
echo " ERROR! $@"
|
|
}
|
|
fi
|
|
|
|
PATH=/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin
|
|
export PATH
|
|
|
|
mode=$1 # start or stop
|
|
|
|
case `echo "testing\c"`,`echo -n testing` in
|
|
*c*,-n*) echo_n= echo_c= ;;
|
|
*c*,*) echo_n=-n echo_c= ;;
|
|
*) echo_n= echo_c='\c' ;;
|
|
esac
|
|
|
|
parse_server_arguments() {
|
|
for arg do
|
|
case "$arg" in
|
|
--basedir=*) basedir=`echo "$arg" | sed -e 's/^[^=]*=//'`
|
|
bindir="$basedir/bin"
|
|
if test -z "$datadir_set"; then
|
|
datadir="$basedir/data"
|
|
fi
|
|
sbindir="$basedir/sbin"
|
|
libexecdir="$basedir/libexec"
|
|
;;
|
|
--datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'`
|
|
datadir_set=1
|
|
;;
|
|
--user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
|
--pid-file=*) server_pid_file=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
|
--use-mysqld_safe) use_mysqld_safe=1;;
|
|
--use-manager) use_mysqld_safe=0;;
|
|
esac
|
|
done
|
|
}
|
|
|
|
parse_manager_arguments() {
|
|
for arg do
|
|
case "$arg" in
|
|
--pid-file=*) pid_file=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
|
--user=*) user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
|
|
esac
|
|
done
|
|
}
|
|
|
|
wait_for_pid () {
|
|
i=0
|
|
while test $i -lt 35 ; do
|
|
sleep 1
|
|
case "$1" in
|
|
'created')
|
|
test -s $pid_file && i='' && break
|
|
;;
|
|
'removed')
|
|
test ! -s $pid_file && i='' && break
|
|
;;
|
|
*)
|
|
echo "wait_for_pid () usage: wait_for_pid created|removed"
|
|
exit 1
|
|
;;
|
|
esac
|
|
echo $echo_n ".$echo_c"
|
|
i=`expr $i + 1`
|
|
done
|
|
|
|
if test -z "$i" ; then
|
|
log_success_msg
|
|
else
|
|
log_failure_msg
|
|
fi
|
|
}
|
|
|
|
# Get arguments from the my.cnf file,
|
|
# the only group, which is read from now on is [mysqld]
|
|
if test -x ./bin/my_print_defaults
|
|
then
|
|
print_defaults="./bin/my_print_defaults"
|
|
elif test -x $bindir/my_print_defaults
|
|
then
|
|
print_defaults="$bindir/my_print_defaults"
|
|
elif test -x $bindir/mysql_print_defaults
|
|
then
|
|
print_defaults="$bindir/mysql_print_defaults"
|
|
else
|
|
# Try to find basedir in /etc/my.cnf
|
|
conf=/etc/my.cnf
|
|
print_defaults=
|
|
if test -r $conf
|
|
then
|
|
subpat='^[^=]*basedir[^=]*=\(.*\)$'
|
|
dirs=`sed -e "/$subpat/!d" -e 's//\1/' $conf`
|
|
for d in $dirs
|
|
do
|
|
d=`echo $d | sed -e 's/[ ]//g'`
|
|
if test -x "$d/bin/my_print_defaults"
|
|
then
|
|
print_defaults="$d/bin/my_print_defaults"
|
|
break
|
|
fi
|
|
if test -x "$d/bin/mysql_print_defaults"
|
|
then
|
|
print_defaults="$d/bin/mysql_print_defaults"
|
|
break
|
|
fi
|
|
done
|
|
fi
|
|
|
|
# Hope it's in the PATH ... but I doubt it
|
|
test -z "$print_defaults" && print_defaults="my_print_defaults"
|
|
fi
|
|
|
|
#
|
|
# Read defaults file from 'basedir'. If there is no defaults file there
|
|
# check if it's in the old (depricated) place (datadir) and read it from there
|
|
#
|
|
|
|
extra_args=""
|
|
if test -r "$basedir/my.cnf"
|
|
then
|
|
extra_args="-e $basedir/my.cnf"
|
|
else
|
|
if test -r "$datadir/my.cnf"
|
|
then
|
|
extra_args="-e $datadir/my.cnf"
|
|
fi
|
|
fi
|
|
|
|
parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server`
|
|
|
|
# Look for the pidfile
|
|
parse_manager_arguments `$print_defaults $extra_args manager`
|
|
|
|
#
|
|
# Set pid file if not given
|
|
#
|
|
if test -z "$pid_file"
|
|
then
|
|
pid_file=$datadir/mysqlmanager-`@HOSTNAME@`.pid
|
|
else
|
|
case "$pid_file" in
|
|
/* ) ;;
|
|
* ) pid_file="$datadir/$pid_file" ;;
|
|
esac
|
|
fi
|
|
if test -z "$server_pid_file"
|
|
then
|
|
server_pid_file=$datadir/`@HOSTNAME@`.pid
|
|
else
|
|
case "$server_pid_file" in
|
|
/* ) ;;
|
|
* ) server_pid_file="$datadir/$server_pid_file" ;;
|
|
esac
|
|
fi
|
|
|
|
# Safeguard (relative paths, core dumps..)
|
|
cd $basedir
|
|
|
|
case "$mode" in
|
|
'start')
|
|
# Start daemon
|
|
|
|
manager=$bindir/mysqlmanager
|
|
if test -x $libexecdir/mysqlmanager
|
|
then
|
|
manager=$libexecdir/mysqlmanager
|
|
elif test -x $sbindir/mysqlmanager
|
|
then
|
|
manager=$sbindir/mysqlmanager
|
|
fi
|
|
|
|
echo $echo_n "Starting MySQL"
|
|
if test -x $manager -a "$use_mysqld_safe" = "0"
|
|
then
|
|
# Give extra arguments to mysqld with the my.cnf file. This script may
|
|
# be overwritten at next upgrade.
|
|
"$manager" \
|
|
--mysqld-safe-compatible \
|
|
--user="$user" \
|
|
--pid-file="$pid_file" >/dev/null 2>&1 &
|
|
wait_for_pid created
|
|
|
|
# Make lock for RedHat / SuSE
|
|
if test -w /var/lock/subsys
|
|
then
|
|
touch /var/lock/subsys/mysqlmanager
|
|
fi
|
|
elif test -x $bindir/mysqld_safe
|
|
then
|
|
# Give extra arguments to mysqld with the my.cnf file. This script
|
|
# may be overwritten at next upgrade.
|
|
pid_file=$server_pid_file
|
|
$bindir/mysqld_safe --datadir=$datadir --pid-file=$server_pid_file >/dev/null 2>&1 &
|
|
wait_for_pid created
|
|
|
|
# Make lock for RedHat / SuSE
|
|
if test -w /var/lock/subsys
|
|
then
|
|
touch /var/lock/subsys/mysql
|
|
fi
|
|
else
|
|
log_failure_msg "Couldn't find MySQL manager or server"
|
|
fi
|
|
;;
|
|
|
|
'stop')
|
|
# Stop daemon. We use a signal here to avoid having to know the
|
|
# root password.
|
|
|
|
# The RedHat / SuSE lock directory to remove
|
|
lock_dir=/var/lock/subsys/mysqlmanager
|
|
|
|
# If the manager pid_file doesn't exist, try the server's
|
|
if test ! -s "$pid_file"
|
|
then
|
|
pid_file=$server_pid_file
|
|
lock_dir=/var/lock/subsys/mysql
|
|
fi
|
|
|
|
if test -s "$pid_file"
|
|
then
|
|
mysqlmanager_pid=`cat $pid_file`
|
|
echo $echo_n "Shutting down MySQL"
|
|
kill $mysqlmanager_pid
|
|
# mysqlmanager should remove the pid_file when it exits, so wait for it.
|
|
wait_for_pid removed
|
|
|
|
# delete lock for RedHat / SuSE
|
|
if test -f $lock_dir
|
|
then
|
|
rm -f $lock_dir
|
|
fi
|
|
else
|
|
log_failure_msg "MySQL manager or server PID file could not be found!"
|
|
fi
|
|
;;
|
|
|
|
'restart')
|
|
# Stop the service and regardless of whether it was
|
|
# running or not, start it again.
|
|
$0 stop
|
|
$0 start
|
|
;;
|
|
|
|
'reload')
|
|
if test -s "$server_pid_file" ; then
|
|
mysqld_pid=`cat $server_pid_file`
|
|
kill -HUP $mysqld_pid && log_success_msg "Reloading service MySQL"
|
|
touch $server_pid_file
|
|
else
|
|
log_failure_msg "MySQL PID file could not be found!"
|
|
fi
|
|
;;
|
|
|
|
*)
|
|
# usage
|
|
echo "Usage: $0 start|stop|restart|reload"
|
|
exit 1
|
|
;;
|
|
esac
|