Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0

into  linux.site:/home/reggie/bk/mysql-5.0-new


server-tools/instance-manager/IMService.cpp:
  Auto merged

1 files changed, 3 insertions, 3 deletions

diff --git a/server-tools/instance-manager/IMService.cpp b/server-tools/instance-manager/IMService.cpp
index a5070dcf0f6..e040a5da8c2 100644
--- a/server-tools/instance-manager/IMService.cpp
+++ b/server-tools/instance-manager/IMService.cpp
@@ -50,7 +50,7 @@ int HandleServiceOptions(Options options)
     else
     {
       log_info("Service failed to install");
-      ret_val= -1;
+      ret_val= 1;
     }
   }
   else if (options.remove_service)
@@ -62,10 +62,10 @@ int HandleServiceOptions(Options options)
     else
     {
       log_info("Service failed to remove");
-      ret_val= -1;
+      ret_val= 1;
     }
   }
   else
-    return (int)winService.Init();
+    ret_val= !winService.Init();
   return ret_val;
 }