summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/manager.cc
diff options
context:
space:
mode:
authoranozdrin/alik@alik. <>2006-10-20 22:26:40 +0400
committeranozdrin/alik@alik. <>2006-10-20 22:26:40 +0400
commit643606cac9ee6e7ca3deefaf2a98af85223eff29 (patch)
treea885956d2db57e78caa404748c123adca76d0642 /server-tools/instance-manager/manager.cc
parent384f0fee0dde46e655a3b7565754ad9e0d0489db (diff)
downloadmariadb-git-643606cac9ee6e7ca3deefaf2a98af85223eff29.tar.gz
Instance Manager polishing.
Diffstat (limited to 'server-tools/instance-manager/manager.cc')
-rw-r--r--server-tools/instance-manager/manager.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc
index 6f28c39da77..ec22e5c4fbb 100644
--- a/server-tools/instance-manager/manager.cc
+++ b/server-tools/instance-manager/manager.cc
@@ -110,7 +110,7 @@ void stop_all(Guardian_thread *guardian, Thread_registry *registry)
Let guardian thread know that it should break it's processing cycle,
once it wakes up.
*/
- guardian->request_shutdown(true);
+ guardian->request_shutdown();
/* wake guardian */
pthread_cond_signal(&guardian->COND_guardian);
/* stop all threads */
@@ -282,8 +282,7 @@ void manager(const Options &options)
{
if (!guardian_thread.is_stopped())
{
- bool stop_instances= true;
- guardian_thread.request_shutdown(stop_instances);
+ guardian_thread.request_shutdown();
pthread_cond_signal(&guardian_thread.COND_guardian);
}
else