bzr commit into mysql-5.1-telco-7.0 branch (jack:2977) Bug#45588

[jack andrews]

#At file:///D:/repo/nodaemon45588/ based on revid:jack@stripped

 2977 jack andrews	2009-09-09
      Bug #45588 ndb_mgmd outputs to logs but not to console without --nodaemon
        . previous fix only fixed ndbd, this fix does ndb_mgmd

    modified:
      storage/ndb/src/mgmsrv/main.cpp
=== modified file 'storage/ndb/src/mgmsrv/main.cpp'
--- a/storage/ndb/src/mgmsrv/main.cpp	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/mgmsrv/main.cpp	2009-09-09 05:39:01 +0000
@@ -96,7 +96,7 @@ static struct my_option my_long_options[
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "daemon", 'd', "Run ndb_mgmd in daemon mode (default)",
     (uchar**) &opts.daemon, (uchar**) &opts.daemon, 0,
-    GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0 },
+    GET_BOOL, NO_ARG, IF_WIN(0,1), 0, 0, 0, 0, 0 },
   { "interactive", 256,
     "Run interactive. Not supported but provided for testing purposes",
     (uchar**) &opts.interactive, (uchar**) &opts.interactive, 0,
@@ -108,7 +108,7 @@ static struct my_option my_long_options[
   { "nodaemon", 256,
     "Don't run as daemon, but don't read from stdin",
     (uchar**) &opts.non_interactive, (uchar**) &opts.non_interactive, 0,
-    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
+    GET_BOOL, NO_ARG, IF_WIN(1,0), 0, 0, 0, 0, 0 },
   { "mycnf", 256,
     "Read cluster config from my.cnf",
     (uchar**) &opts.mycnf, (uchar**) &opts.mycnf, 0,


Attachment: [text/bzr-bundle] bzr/[e-mail]