Commit 417440fb authored by anozdrin@mysql.com's avatar anozdrin@mysql.com

Fix compilation error on FC4.

parent c1113af1
...@@ -133,6 +133,7 @@ void manager() ...@@ -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,11 +244,8 @@ void manager() ...@@ -243,11 +244,8 @@ 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.guardian->lock();
instance_map.lock(); instance_map.lock();
...@@ -263,6 +261,7 @@ void manager() ...@@ -263,6 +261,7 @@ void manager()
"binary. Aborting."); "binary. Aborting.");
return; return;
} }
}
/* /*
After the list of guarded instances have been initialized, After the list of guarded instances have been initialized,
...@@ -272,6 +271,7 @@ void manager() ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment