database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my50-bug22379_runtime

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my51-bug22379_runtime
This commit is contained in:
msvensson@neptunus.(none)
2006-09-25 09:34:34 +02:00
parent 2fe744c878 d2ebe6be03
commit 18f04d48a4
3 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -611,18 +611,19 @@ void Instance::kill_instance(int signum)
/* if there are no pid, everything seems to be fine */
if ((pid= options.get_pid()) != 0) /* get pid from pidfile */
{
/*
If we cannot kill mysqld, then it has propably crashed.
Let us try to remove staled pidfile and return successfully
as mysqld is probably stopped.
*/
if (!kill(pid, signum))
options.unlink_pidfile();
else if (signum == SIGKILL) /* really killed instance with SIGKILL */
log_error("The instance %s is being stopped forsibly. Normally \
it should not happed. Probably the instance has been \
hanging. You should also check your IM setup",
options.instance_name);
if (kill(pid, signum) == 0)
{
/* Kill suceeded */
if (signum == SIGKILL) /* really killed instance with SIGKILL */
{
log_error("The instance %s is being stopped forcibly. Normally" \
"it should not happen. Probably the instance has been" \
"hanging. You should also check your IM setup",
options.instance_name);
/* After sucessful hard kill the pidfile need to be removed */
options.unlink_pidfile();
}
}
}
return;
}