diff options
| author | unknown <petr@mysql.com> | 2005-08-19 17:19:12 +0400 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2005-08-19 17:19:12 +0400 |
| commit | 933db613fe5943ec504ba25d1a28c3f828cb3bae (patch) | |
| tree | 49fbbfe211066b63a646a342bb70e002c70912e0 /server-tools/instance-manager/instance.h | |
| parent | 8fd77a045c3bf4f08e6c9e00f94692690d01b6f5 (diff) | |
| download | mariadb-git-933db613fe5943ec504ba25d1a28c3f828cb3bae.tar.gz | |
Fix for BUG#10957 "stop instance, issued after flush instances causes IM to crash"
Recommited with post-review fixes
server-tools/instance-manager/instance.cc:
fix behaviour of monitoring routines: they should not rely on the fact that instance object
which was used when the instances started exists at stop(). Instead routines should save the
name of the instance and look for it in the instance_map when needed.
server-tools/instance-manager/instance.h:
new functions declared. functions, which were converted to static removed from the class.
server-tools/instance-manager/instance_options.cc:
fix valgrind warning
Diffstat (limited to 'server-tools/instance-manager/instance.h')
| -rw-r--r-- | server-tools/instance-manager/instance.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server-tools/instance-manager/instance.h b/server-tools/instance-manager/instance.h index 0ff5ecc179e..ee37690d40a 100644 --- a/server-tools/instance-manager/instance.h +++ b/server-tools/instance-manager/instance.h @@ -41,7 +41,8 @@ public: /* send a signal to the instance */ void kill_instance(int signo); int is_crashed(); - void fork_and_monitor(); + void set_crash_flag_n_wake_all(); + Instance_map *Instance::get_map(); public: enum { DEFAULT_SHUTDOWN_DELAY= 35 }; @@ -63,7 +64,6 @@ private: Instance_map *instance_map; void remove_pid(); - int launch_and_wait(); }; #endif /* INCLUDES_MYSQL_INSTANCE_MANAGER_INSTANCE_H */ |