database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

more fixes for IM to substitude mysqld_safe in startup scripts

Browse Source
This commit is contained in:
petr@mysql.com
2005-01-31 23:54:08 +03:00
parent 7ddedf1ee5
commit 84d5b3a332
14 changed files with 160 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server-tools/instance-manager/manager.cc
View File

@@ -67,9 +67,7 @@ void manager(const Options &options)
*/
User_map user_map;
Instance_map instance_map(options.default_mysqld_path,
options.default_admin_user,
options.default_admin_password);
Instance_map instance_map(options.default_mysqld_path);
Guardian_thread guardian_thread(thread_registry,
&instance_map,
options.monitoring_interval);
@@ -181,8 +179,17 @@ void manager(const Options &options)
pthread_cond_broadcast(&guardian_thread.COND_guardian);
break;
default:
thread_registry.deliver_shutdown();
shutdown_complete= TRUE;
if (!guardian_thread.is_stopped)
{
guardian_thread.request_stop_instances();
guardian_thread.shutdown();
pthread_cond_broadcast(&guardian_thread.COND_guardian);
}
else
{
thread_registry.deliver_shutdown();
shutdown_complete= TRUE;
}
break;
}
}