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.

1 files changed, 5 insertions, 9 deletions

diff --git a/server-tools/instance-manager/instance.h b/server-tools/instance-manager/instance.h
index 329eaa68b1a..412d01acc46 100644
--- a/server-tools/instance-manager/instance.h
+++ b/server-tools/instance-manager/instance.h
@@ -88,21 +88,19 @@ public:
   static bool is_mysqld_compatible_name(const LEX_STRING *name);
 
 public:
-  Instance(Thread_registry &thread_registry_arg);
+  Instance();
 
   ~Instance();
-  int init(const LEX_STRING *name_arg);
-  int complete_initialization(Instance_map *instance_map_arg,
-                              const char *mysqld_path);
+  bool init(const LEX_STRING *name_arg);
+  bool complete_initialization();
 
-  bool is_running();
+  bool is_mysqld_running();
   int start();
   int stop();
   /* send a signal to the instance */
-  void kill_instance(int signo);
+  void kill_mysqld(int signo);
   bool is_crashed();
   void set_crash_flag_n_wake_all();
-  Instance_map *get_map();
 
   /*
     The operation is intended to check if the instance is mysqld-compatible
@@ -121,7 +119,6 @@ public:
 public:
   enum { DEFAULT_SHUTDOWN_DELAY= 35 };
   Instance_options options;
-  Thread_registry &thread_registry;
 
 private:
   /* This attributes is a flag, specifies if the instance has been crashed. */
@@ -155,7 +152,6 @@ private:
     stop in Instance::stop()
   */
   pthread_cond_t COND_instance_stopped;
-  Instance_map *instance_map;
 
   void  remove_pid();
 };