bk commit into 5.1 tree (anozdrin:1.2360)

[Alexander Nozdrin]

Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2360 06/05/18 22:31:28 anozdrin@stripped +1 -0
  Fix compilation error on FC4.

  server-tools/instance-manager/manager.cc
    1.33 06/05/18 22:31:25 anozdrin@stripped +15 -15
    Fix compilation error on FC4.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	station.home
# Root:	/mnt/raid/MySQL/devel/5.1-rt-wl3158

--- 1.32/server-tools/instance-manager/manager.cc	2006-05-18 18:57:44 +04:00
+++ 1.33/server-tools/instance-manager/manager.cc	2006-05-18 22:31:25 +04:00
@@ -133,6 +133,7 @@
 {
   int err_code;
   const char *err_msg;
+  bool shutdown_complete= FALSE;
 
   Thread_registry thread_registry;
   /*
@@ -243,25 +244,23 @@
     To work nicely with LinuxThreads, the signal thread is the first thread
     in the process.
   */
-  int signo;
-  bool shutdown_complete;
 
-  shutdown_complete= FALSE;
-
-  instance_map.guardian->lock();
-  instance_map.lock();
+  {
+    instance_map.guardian->lock();
+    instance_map.lock();
 
-  int flush_instances_status= instance_map.flush_instances();
+    int flush_instances_status= instance_map.flush_instances();
 
-  instance_map.unlock();
-  instance_map.guardian->unlock();
+    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;
+    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 @@
 
   while (!shutdown_complete)
   {
+    int signo;
     int status= 0;
 
     if ((status= my_sigwait(&mask, &signo)) != 0)