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, 10 insertions, 1 deletions

diff --git a/server-tools/instance-manager/manager.h b/server-tools/instance-manager/manager.h
index 5abe029a3d8..1f2b2cf6926 100644
--- a/server-tools/instance-manager/manager.h
+++ b/server-tools/instance-manager/manager.h
@@ -19,9 +19,12 @@
 #if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
 #pragma interface
 #endif
+#include <my_global.h>
 
 class Guardian;
 class Instance_map;
+class Thread_registry;
+class User_map;
 
 class Manager
 {
@@ -33,12 +36,18 @@ public:
   */
   static Instance_map *get_instance_map() { return p_instance_map; }
   static Guardian *get_guardian() { return p_guardian; }
+  static Thread_registry *get_thread_registry() { return p_thread_registry; }
+  static User_map *get_user_map() { return p_user_map; }
+  static pid_t get_manager_pid() { return manager_pid; }
 
 private:
-  static int manager_impl();
+  static void stop_all_threads();
 private:
+  static pid_t manager_pid;
   static Guardian *p_guardian;
   static Instance_map *p_instance_map;
+  static Thread_registry *p_thread_registry;
+  static User_map *p_user_map;
 };
 
 #endif // INCLUDES_MYSQL_INSTANCE_MANAGER_MANAGER_H