From 6b4dbcb4db8236d5226284ff87af9126aa83f5b6 Mon Sep 17 00:00:00 2001
From: unknown <petr@mysql.com>
Date: Mon, 16 May 2005 01:54:02 +0400
Subject: post-review fixes

include/my_sys.h:
  added prototype for the defaults correction function
libmysql/Makefile.shared:
  my_chsize added to libmysql to let my_correct_defaults_file be used from libmysql
mysys/default.c:
  New defaults function added we use it to correct defaults file. Currently the function doesn't lock defaults
  file. This is because of the linking and backwards-compatibility issues. This needs to be fixed later.
mysys/my_chsize.c:
  comment added
server-tools/instance-manager/buffer.cc:
  cleanup
server-tools/instance-manager/commands.cc:
  refactoring: removed do_command method from most of the classes
server-tools/instance-manager/commands.h:
  cleanup
server-tools/instance-manager/guardian.cc:
  cleanup
server-tools/instance-manager/instance.cc:
  cleanup
server-tools/instance-manager/instance_map.cc:
  cleanup
server-tools/instance-manager/instance_options.cc:
  cleanup
server-tools/instance-manager/instance_options.h:
  cleanup
server-tools/instance-manager/listener.cc:
  cleanup
server-tools/instance-manager/log.cc:
  cleanup
server-tools/instance-manager/manager.cc:
  cleanup
server-tools/instance-manager/messages.cc:
  new errors added
server-tools/instance-manager/mysql_connection.cc:
  cleanup
server-tools/instance-manager/mysql_manager_error.h:
  new error codes added
server-tools/instance-manager/mysqlmanager.cc:
  clenup
server-tools/instance-manager/options.cc:
  cleanup
server-tools/instance-manager/parse.cc:
  removed unused function
server-tools/instance-manager/parse.h:
  removed prototype
server-tools/instance-manager/protocol.cc:
  cleanup
server-tools/instance-manager/protocol.h:
  added enum to be used in protocol.cc instead of the constants
---
 server-tools/instance-manager/instance.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'server-tools/instance-manager/instance.cc')

diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc
index 9fdcab7ce7c..615f16f9e22 100644
--- a/server-tools/instance-manager/instance.cc
+++ b/server-tools/instance-manager/instance.cc
@@ -304,12 +304,11 @@ void Instance::kill_instance(int signum)
     */
     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);
+    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);
   }
   return;
 }
-- 
cgit v1.2.1