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, 16 insertions, 13 deletions

diff --git a/server-tools/instance-manager/parse.cc b/server-tools/instance-manager/parse.cc
index 048f7983b32..be3adc4167a 100644
--- a/server-tools/instance-manager/parse.cc
+++ b/server-tools/instance-manager/parse.cc
@@ -269,7 +269,7 @@ void skip_spaces(const char **text)
 }
 
 
-Command *parse_command(Instance_map *map, const char *text)
+Command *parse_command(const char *text)
 {
   uint word_len;
   LEX_STRING instance_name;
@@ -294,7 +294,7 @@ Command *parse_command(Instance_map *map, const char *text)
 
     if (tok1 == TOK_CREATE)
     {
-      Create_instance *cmd= new Create_instance(map, &instance_name);
+      Create_instance *cmd= new Create_instance(&instance_name);
 
       if (!cmd)
         return NULL; /* Report ER_OUT_OF_RESOURCES. */
@@ -317,16 +317,16 @@ Command *parse_command(Instance_map *map, const char *text)
 
     switch (tok1) {
     case TOK_START:
-      command= new Start_instance(map, &instance_name);
+      command= new Start_instance(&instance_name);
       break;
     case TOK_STOP:
-      command= new Stop_instance(map, &instance_name);
+      command= new Stop_instance(&instance_name);
       break;
     case TOK_CREATE:
       ; /* command already initialized. */
       break;
     case TOK_DROP:
-      command= new Drop_instance(map, &instance_name);
+      command= new Drop_instance(&instance_name);
       break;
     default: /* this is impossible, but nevertheless... */
       DBUG_ASSERT(0);
@@ -340,7 +340,7 @@ Command *parse_command(Instance_map *map, const char *text)
     if (word_len)
       goto syntax_error;
 
-    command= new Flush_instances(map);
+    command= new Flush_instances();
     break;
   case TOK_UNSET:
   case TOK_SET:
@@ -348,9 +348,9 @@ Command *parse_command(Instance_map *map, const char *text)
       Abstract_option_cmd *cmd;
 
       if (tok1 == TOK_SET)
-        cmd= new Set_option(map);
+        cmd= new Set_option();
       else
-        cmd= new Unset_option(map);
+        cmd= new Unset_option();
 
       if (!cmd)
         return NULL; /* Report ER_OUT_OF_RESOURCES. */
@@ -371,7 +371,7 @@ Command *parse_command(Instance_map *map, const char *text)
       get_word(&text, &word_len, NONSPACE);
       if (word_len)
         goto syntax_error;
-      command= new Show_instances(map);
+      command= new Show_instances();
       break;
     case TOK_INSTANCE:
       switch (Token tok2= shift_token(&text, &word_len)) {
@@ -385,9 +385,9 @@ Command *parse_command(Instance_map *map, const char *text)
         if (word_len)
           goto syntax_error;
         if (tok2 == TOK_STATUS)
-          command= new Show_instance_status(map, &instance_name);
+          command= new Show_instance_status(&instance_name);
         else
-          command= new Show_instance_options(map, &instance_name);
+          command= new Show_instance_options(&instance_name);
         break;
       default:
         goto syntax_error;
@@ -414,7 +414,7 @@ Command *parse_command(Instance_map *map, const char *text)
             /* check that this is the end of the command */
             if (word_len)
               goto syntax_error;
-            command= new Show_instance_log_files(map, &instance_name);
+            command= new Show_instance_log_files(&instance_name);
             break;
           case TOK_ERROR:
           case TOK_GENERAL:
@@ -484,7 +484,7 @@ Command *parse_command(Instance_map *map, const char *text)
                 goto syntax_error;
             }
 
-            command= new Show_instance_log(map, &instance_name,
+            command= new Show_instance_log(&instance_name,
                                            log_type, log_size, log_offset);
           break;
           default:
@@ -504,5 +504,8 @@ Command *parse_command(Instance_map *map, const char *text)
 syntax_error:
     command= new Syntax_error();
   }
+
+  DBUG_ASSERT(command);
+
   return command;
 }