mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +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.
105 lines
3.9 KiB
C++
105 lines
3.9 KiB
C++
/* Copyright (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
|
|
|
|
#include "messages.h"
|
|
|
|
#include <my_global.h>
|
|
#include <mysql_com.h>
|
|
|
|
#include "mysqld_error.h"
|
|
#include "mysql_manager_error.h"
|
|
|
|
|
|
static const char *mysqld_error_message(unsigned sql_errno)
|
|
{
|
|
switch (sql_errno) {
|
|
case ER_HANDSHAKE_ERROR:
|
|
return "Bad handshake";
|
|
case ER_OUT_OF_RESOURCES:
|
|
return "Out of memory; Check if mysqld or some other process"
|
|
" uses all available memory. If not you may have to use"
|
|
" 'ulimit' to allow mysqld to use more memory or you can"
|
|
" add more swap space";
|
|
case ER_ACCESS_DENIED_ERROR:
|
|
return "Access denied. Bad username/password pair";
|
|
case ER_NOT_SUPPORTED_AUTH_MODE:
|
|
return "Client does not support authentication protocol requested by"
|
|
" server; consider upgrading MySQL client";
|
|
case ER_UNKNOWN_COM_ERROR:
|
|
return "Unknown command";
|
|
case ER_SYNTAX_ERROR:
|
|
return "You have an error in your command syntax. Check the manual that"
|
|
" corresponds to your MySQL Instance Manager version for the right"
|
|
" syntax to use";
|
|
case ER_BAD_INSTANCE_NAME:
|
|
return "Bad instance name. Check that the instance with such a name exists";
|
|
case ER_INSTANCE_IS_NOT_STARTED:
|
|
return "Cannot stop instance. Perhaps the instance is not started, or was started"
|
|
"manually, so IM cannot find the pidfile.";
|
|
case ER_INSTANCE_ALREADY_STARTED:
|
|
return "The instance is already started";
|
|
case ER_CANNOT_START_INSTANCE:
|
|
return "Cannot start instance. Possible reasons are wrong instance options"
|
|
" or resources shortage";
|
|
case ER_OFFSET_ERROR:
|
|
return "Cannot read negative number of bytes";
|
|
case ER_STOP_INSTANCE:
|
|
return "Cannot stop instance";
|
|
case ER_READ_FILE:
|
|
return "Cannot read requested part of the logfile";
|
|
case ER_NO_SUCH_LOG:
|
|
return "The instance has no such log enabled";
|
|
case ER_OPEN_LOGFILE:
|
|
return "Cannot open log file";
|
|
case ER_GUESS_LOGFILE:
|
|
return "Cannot guess the log filename. Try specifying full log name"
|
|
"in the instance options";
|
|
case ER_ACCESS_OPTION_FILE:
|
|
return "Cannot open the option file to edit. Check permissions";
|
|
case ER_DROP_ACTIVE_INSTANCE:
|
|
return "Cannot drop an active instance. You should stop it first";
|
|
case ER_CREATE_EXISTING_INSTANCE:
|
|
return "Instance already exists";
|
|
case ER_INSTANCE_MISCONFIGURED:
|
|
return "Instance is misconfigured. Cannot start it";
|
|
case ER_MALFORMED_INSTANCE_NAME:
|
|
return "Malformed instance name.";
|
|
case ER_INSTANCE_IS_ACTIVE:
|
|
return "The instance is active. Stop the instance first";
|
|
case ER_THERE_IS_ACTIVE_INSTACE:
|
|
return "At least one instance is active. Stop all instances first";
|
|
case ER_INCOMPATIBLE_OPTION:
|
|
return "Instance Manager-specific options are prohibited from being used "
|
|
"in the configuration of mysqld-compatible instances";
|
|
case ER_CONF_FILE_DOES_NOT_EXIST:
|
|
return "Configuration file does not exist";
|
|
default:
|
|
DBUG_ASSERT(0);
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
const char *message(unsigned sql_errno)
|
|
{
|
|
return mysqld_error_message(sql_errno);
|
|
}
|
|
|
|
|
|
const char *errno_to_sqlstate(unsigned sql_errno)
|
|
{
|
|
return mysql_errno_to_sqlstate(sql_errno);
|
|
}
|