mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for instances in Crashed, Failed and Abandoned" to ease review process. Evaluate global variable linuxthreads before starting threads to avoid a race. server-tools/instance-manager/buffer.cc: Fix spelling. server-tools/instance-manager/command.h: Fix spelling. server-tools/instance-manager/commands.cc: Fix spelling. server-tools/instance-manager/commands.h: Fix spelling, tidy up. server-tools/instance-manager/guardian.cc: Cleanup logging, options.get_shutdown_delay() is a method, tidy up. server-tools/instance-manager/instance.cc: Rearrange methods to be the same as in Alik's patch, fix spelling errors, clean up logging texts, port comments from Alik's patch, implement some basic renames from his patch. No real changes. server-tools/instance-manager/instance.h: Tidy up, renames. server-tools/instance-manager/instance_map.cc: Fix spellings, port some refactoring from Alik's patch. server-tools/instance-manager/instance_map.h: Cleanup. server-tools/instance-manager/instance_options.cc: Cleanup. Implement Instance_options::get_shutdown_delay() and Instance_options::get_mysqld_port(). server-tools/instance-manager/instance_options.h: Cleanup. server-tools/instance-manager/listener.cc: Cleanup. server-tools/instance-manager/log.cc: Fix spelling. server-tools/instance-manager/manager.cc: Cleanup. server-tools/instance-manager/manager.h: Add getters for Manager members. server-tools/instance-manager/mysqlmanager.cc: Evaluate linuxthreads before starting threads to avoid a race. server-tools/instance-manager/parse_output.cc: Fix spelling. server-tools/instance-manager/priv.cc: Cleanup. server-tools/instance-manager/priv.h: Cleanup. server-tools/instance-manager/user_management_commands.cc: Fix spelling. server-tools/instance-manager/user_management_commands.h: Fix spelling. server-tools/instance-manager/user_map.cc: Fix spelling.
This commit is contained in:
@ -32,15 +32,11 @@
|
||||
|
||||
/*
|
||||
Print all instances of this instance manager.
|
||||
Grammar: SHOW ISTANCES
|
||||
Grammar: SHOW INSTANCES
|
||||
*/
|
||||
|
||||
class Show_instances : public Command
|
||||
class Show_instances: public Command
|
||||
{
|
||||
public:
|
||||
Show_instances()
|
||||
{ }
|
||||
|
||||
public:
|
||||
int execute(st_net *net, ulong connection_id);
|
||||
|
||||
@ -57,10 +53,6 @@ private:
|
||||
|
||||
class Flush_instances : public Command
|
||||
{
|
||||
public:
|
||||
Flush_instances()
|
||||
{ }
|
||||
|
||||
public:
|
||||
int execute(st_net *net, ulong connection_id);
|
||||
};
|
||||
@ -103,7 +95,7 @@ private:
|
||||
|
||||
/*
|
||||
Print status of an instance.
|
||||
Grammar: SHOW ISTANCE STATUS <instance_name>
|
||||
Grammar: SHOW INSTANCE STATUS <instance_name>
|
||||
*/
|
||||
|
||||
class Show_instance_status : public Abstract_instance_cmd
|
||||
@ -319,10 +311,6 @@ private:
|
||||
|
||||
class Set_option : public Abstract_option_cmd
|
||||
{
|
||||
public:
|
||||
Set_option()
|
||||
{ }
|
||||
|
||||
protected:
|
||||
virtual bool parse_args(const char **text);
|
||||
virtual int process_option(Instance *instance, Named_value *option);
|
||||
@ -336,10 +324,6 @@ protected:
|
||||
|
||||
class Unset_option: public Abstract_option_cmd
|
||||
{
|
||||
public:
|
||||
Unset_option()
|
||||
{ }
|
||||
|
||||
protected:
|
||||
virtual bool parse_args(const char **text);
|
||||
virtual int process_option(Instance *instance, Named_value *option);
|
||||
@ -357,10 +341,6 @@ protected:
|
||||
|
||||
class Syntax_error : public Command
|
||||
{
|
||||
public:
|
||||
Syntax_error()
|
||||
{ }
|
||||
|
||||
public:
|
||||
int execute(st_net *net, ulong connection_id);
|
||||
};
|
||||
|
Reference in New Issue
Block a user