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.

1 files changed, 10 insertions, 36 deletions

diff --git a/server-tools/instance-manager/commands.h b/server-tools/instance-manager/commands.h
index 9a9911f2358..cf753d8368c 100644
--- a/server-tools/instance-manager/commands.h
+++ b/server-tools/instance-manager/commands.h
@@ -38,9 +38,6 @@
 class Show_instances : public Command
 {
 public:
-  Show_instances(Instance_map *instance_map_arg): Command(instance_map_arg)
-  {}
-
   int execute(st_net *net, ulong connection_id);
 
 private:
@@ -57,9 +54,6 @@ private:
 class Flush_instances : public Command
 {
 public:
-  Flush_instances(Instance_map *instance_map_arg): Command(instance_map_arg)
-  {}
-
   int execute(st_net *net, ulong connection_id);
 };
 
@@ -71,8 +65,7 @@ public:
 class Abstract_instance_cmd : public Command
 {
 public:
-  Abstract_instance_cmd(Instance_map *instance_map_arg,
-                        const LEX_STRING *instance_name_arg);
+  Abstract_instance_cmd(const LEX_STRING *instance_name_arg);
 
 public:
   virtual int execute(st_net *net, ulong connection_id);
@@ -108,8 +101,7 @@ private:
 class Show_instance_status : public Abstract_instance_cmd
 {
 public:
-  Show_instance_status(Instance_map *instance_map_arg,
-                       const LEX_STRING *instance_name_arg);
+  Show_instance_status(const LEX_STRING *instance_name_arg);
 
 protected:
   virtual int execute_impl(st_net *net, Instance *instance);
@@ -129,8 +121,7 @@ private:
 class Show_instance_options : public Abstract_instance_cmd
 {
 public:
-  Show_instance_options(Instance_map *instance_map_arg,
-                        const LEX_STRING *instance_name_arg);
+  Show_instance_options(const LEX_STRING *instance_name_arg);
 
 protected:
   virtual int execute_impl(st_net *net, Instance *instance);
@@ -150,8 +141,7 @@ private:
 class Start_instance : public Abstract_instance_cmd
 {
 public:
-  Start_instance(Instance_map *instance_map_arg,
-                 const LEX_STRING *instance_name_arg);
+  Start_instance(const LEX_STRING *instance_name_arg);
 
 protected:
   virtual int execute_impl(st_net *net, Instance *instance);
@@ -167,8 +157,7 @@ protected:
 class Stop_instance : public Abstract_instance_cmd
 {
 public:
-  Stop_instance(Instance_map *instance_map_arg,
-                const LEX_STRING *instance_name_arg);
+  Stop_instance(const LEX_STRING *instance_name_arg);
 
 protected:
   virtual int execute_impl(st_net *net, Instance *instance);
@@ -184,8 +173,7 @@ protected:
 class Create_instance : public Command
 {
 public:
-  Create_instance(Instance_map *instance_map_arg,
-                  const LEX_STRING *instance_name_arg);
+  Create_instance(const LEX_STRING *instance_name_arg);
 
 public:
   bool init(const char **text);
@@ -220,8 +208,7 @@ private:
 class Drop_instance : public Abstract_instance_cmd
 {
 public:
-  Drop_instance(Instance_map *instance_map_arg,
-                const LEX_STRING *instance_name_arg);
+  Drop_instance(const LEX_STRING *instance_name_arg);
 
 protected:
   virtual int execute_impl(st_net *net, Instance *instance);
@@ -238,8 +225,7 @@ protected:
 class Show_instance_log : public Abstract_instance_cmd
 {
 public:
-  Show_instance_log(Instance_map *instance_map_arg,
-                    const LEX_STRING *instance_name_arg,
+  Show_instance_log(const LEX_STRING *instance_name_arg,
                     Log_type log_type_arg, uint size_arg, uint offset_arg);
 
 protected:
@@ -266,8 +252,7 @@ private:
 class Show_instance_log_files : public Abstract_instance_cmd
 {
 public:
-  Show_instance_log_files(Instance_map *instance_map_arg,
-                          const LEX_STRING *instance_name_arg);
+  Show_instance_log_files(const LEX_STRING *instance_name_arg);
 
 protected:
   virtual int execute_impl(st_net *net, Instance *instance);
@@ -299,7 +284,7 @@ public:
   virtual int execute(st_net *net, ulong connection_id);
 
 protected:
-  Abstract_option_cmd(Instance_map *instance_map_arg);
+  Abstract_option_cmd();
 
   int correct_file(Instance *instance, Named_value *option, bool skip);
 
@@ -326,9 +311,6 @@ private:
 
 class Set_option : public Abstract_option_cmd
 {
-public:
-  Set_option(Instance_map *instance_map_arg);
-
 protected:
   virtual bool parse_args(const char **text);
   virtual int process_option(Instance *instance, Named_value *option);
@@ -342,9 +324,6 @@ protected:
 
 class Unset_option: public Abstract_option_cmd
 {
-public:
-  Unset_option(Instance_map *instance_map_arg);
-
 protected:
   virtual bool parse_args(const char **text);
   virtual int process_option(Instance *instance, Named_value *option);
@@ -363,11 +342,6 @@ protected:
 class Syntax_error : public Command
 {
 public:
-  /* This is just to avoid compiler warning. */
-  Syntax_error() :Command(NULL)
-  {}
-
-public:
   int execute(st_net *net, ulong connection_id);
 };