diff options
| author | kostja@bodhi.local <> | 2006-11-16 23:36:20 +0300 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-11-16 23:36:20 +0300 |
| commit | 2f69dfb28fdd3a98137ac16b7280bd86c9345d78 (patch) | |
| tree | dfe03cc1d016a01134a977925be735650f8f32ee /server-tools/instance-manager/instance_map.h | |
| parent | e8d51e62bb901c713aa6a5dbfafdc30004b2816b (diff) | |
| download | mariadb-git-2f69dfb28fdd3a98137ac16b7280bd86c9345d78.tar.gz | |
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
Diffstat (limited to 'server-tools/instance-manager/instance_map.h')
| -rw-r--r-- | server-tools/instance-manager/instance_map.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server-tools/instance-manager/instance_map.h b/server-tools/instance-manager/instance_map.h index 9de40e35e0f..48fc8edc5ad 100644 --- a/server-tools/instance-manager/instance_map.h +++ b/server-tools/instance-manager/instance_map.h @@ -25,7 +25,7 @@ #pragma interface #endif -class Guardian_thread; +class Guardian; class Instance; class Named_value_arr; class Thread_registry; @@ -115,13 +115,13 @@ public: MT-NOTE: the options must be called under acquired locks of the following objects: - Instance_map; - - Guardian_thread; + - Guardian; */ const char *get_instance_state_name(Instance *instance); public: const char *mysqld_path; - Guardian_thread *guardian; + Guardian *guardian; private: /* loads options from config files */ |