mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Cleanup: manually port the polishing parts from Alik's changeset for
BUG#22306: STOP INSTANCE can not be applied for instances in Crashed, Failed and Abandoned mysql-test/t/im_options.imtest: Update test for new framework. server-tools/instance-manager/IMService.cpp: Use Manager class instead of manager(). Reformat comments. server-tools/instance-manager/Makefile.am: Treat warnings as errors. server-tools/instance-manager/command.cc: Store references to Guardian_thread and Instance_map in Command attributes. server-tools/instance-manager/command.h: Store references to Guardian_thread and Instance_map in Command attributes. server-tools/instance-manager/commands.cc: Remove Instance_map argument from command constructors. server-tools/instance-manager/commands.h: Remove Instance_map argument from command constructors. server-tools/instance-manager/guardian.cc: Rename: Guardian_thread -> Guardian server-tools/instance-manager/guardian.h: Rename: Guardian_thread -> Guardian server-tools/instance-manager/instance_map.cc: Rename: Guardian_thread -> Guardian. server-tools/instance-manager/instance_map.h: Rename: Guardian_thread -> Guardian. server-tools/instance-manager/manager.cc: Use Manager class instead of manager() function. server-tools/instance-manager/manager.h: Transfer manager() function into Manager class (singleton). server-tools/instance-manager/mysql_connection.cc: Polishing. server-tools/instance-manager/mysqlmanager.cc: Use Manager class instead of manager() function. server-tools/instance-manager/parse.cc: Rename: Guardian_thread -> Guardian server-tools/instance-manager/parse.h: Rename: Guardian_thread -> Guardian server-tools/instance-manager/priv.cc: Move create_pid_file() out of manager.cc. server-tools/instance-manager/priv.h: Move create_pid_file() out of manager.cc. server-tools/instance-manager/thread_registry.h: Prevent copying. server-tools/instance-manager/user_map.cc: Fix alignment.
This commit is contained in:
@@ -24,6 +24,7 @@
|
||||
|
||||
/* Class responsible for allocation of IM commands. */
|
||||
|
||||
class Guardian;
|
||||
class Instance_map;
|
||||
|
||||
struct st_net;
|
||||
@@ -36,7 +37,7 @@ struct st_net;
|
||||
class Command
|
||||
{
|
||||
public:
|
||||
Command(Instance_map *instance_map_arg= 0);
|
||||
Command();
|
||||
virtual ~Command();
|
||||
|
||||
/*
|
||||
@@ -53,6 +54,7 @@ public:
|
||||
virtual int execute(st_net *net, ulong connection_id) = 0;
|
||||
|
||||
protected:
|
||||
Guardian *guardian;
|
||||
Instance_map *instance_map;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user