diff options
| author | unknown <anozdrin/alik@alik.> | 2006-10-20 22:26:40 +0400 |
|---|---|---|
| committer | unknown <anozdrin/alik@alik.> | 2006-10-20 22:26:40 +0400 |
| commit | 8db4dc3f91dfbe03181e63ed45bdf35a5d65aeb0 (patch) | |
| tree | a885956d2db57e78caa404748c123adca76d0642 /server-tools/instance-manager/manager.cc | |
| parent | a6273e6d40c1ce2eda4c9d7f96ac12f86af89897 (diff) | |
| download | mariadb-git-8db4dc3f91dfbe03181e63ed45bdf35a5d65aeb0.tar.gz | |
Instance Manager polishing.
server-tools/instance-manager/guardian.cc:
1. Removed unused stop_instances_arg from request_shutdown() and
stop_instances() methods.
2. Changed log-output statements so that instance name is passed
correctly (char *, not LEX_STRING)
server-tools/instance-manager/guardian.h:
Removed unused stop_instances_arg from request_shutdown() and
stop_instances() methods.
server-tools/instance-manager/instance.cc:
Removed unused stop_instances_arg from request_shutdown() and
stop_instances() methods.
server-tools/instance-manager/listener.cc:
Be more verbose in log.
server-tools/instance-manager/manager.cc:
Removed unused stop_instances argument.
Diffstat (limited to 'server-tools/instance-manager/manager.cc')
| -rw-r--r-- | server-tools/instance-manager/manager.cc | 5 |
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 |