database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix compilation error on FC4.

Browse Source
This commit is contained in:
unknown
2006-05-18 22:31:28 +04:00
parent 8b4fcf6e3b
commit dfa780e648
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,6 +133,7 @@ void manager()
{ {
int err_code; int err_code;
const char *err_msg; const char *err_msg;
bool shutdown_complete= FALSE;
Thread_registry thread_registry; Thread_registry thread_registry;
/* /*
@ -243,25 +244,23 @@ void manager()
To work nicely with LinuxThreads, the signal thread is the first thread To work nicely with LinuxThreads, the signal thread is the first thread
in the process. in the process.
*/ */
int signo;
bool shutdown_complete;
shutdown_complete= FALSE;
instance_map.guardian->lock();
instance_map.lock();
int flush_instances_status= instance_map.flush_instances();
instance_map.unlock();
instance_map.guardian->unlock();
if (flush_instances_status)
{ {
log_error("Cannot init instances repository. This might be caused by " instance_map.guardian->lock();
"the wrong config file options. For instance, missing mysqld " instance_map.lock();
"binary. Aborting.");
return; int flush_instances_status= instance_map.flush_instances();
instance_map.unlock();
instance_map.guardian->unlock();
if (flush_instances_status)
{
log_error("Cannot init instances repository. This might be caused by "
"the wrong config file options. For instance, missing mysqld "
"binary. Aborting.");
return;
}
} }
/* /*
@ -272,6 +271,7 @@ void manager()
while (!shutdown_complete) while (!shutdown_complete)
{ {
int signo;
int status= 0; int status= 0;
if ((status= my_sigwait(&mask, &signo)) != 0) if ((status= my_sigwait(&mask, &signo)) != 0)