From d65f1c92ede2dfc3be9fc777d87e210fb523ae26 Mon Sep 17 00:00:00 2001
From: unknown <anozdrin/alik@alik.opbmk>
Date: Thu, 22 Feb 2007 22:56:43 +0300
Subject: Merge fix.

---
 server-tools/instance-manager/manager.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc
index bde685d7a28..792461e41a9 100644
--- a/server-tools/instance-manager/manager.cc
+++ b/server-tools/instance-manager/manager.cc
@@ -246,7 +246,8 @@ bool Manager::init_user_map(User_map *user_map)
     See also comments in mysqlmanager.cc to picture general Instance Manager
     architecture.
 
-  TODO: how about returning error status.
+  RETURNS
+    main() returns exit status (exit code).
 */
 
 int Manager::main()
@@ -452,6 +453,7 @@ err:
   /* free alarm structures */
   end_thr_alarm(1);
 #endif
+
   return thread_registry.get_error_status() ? 1 : 0;
 }
 
-- 
cgit v1.2.1