From: jack andrews
Date: September 9 2009 5:40am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (jack:2977) Bug#45588
List-Archive: http://lists.mysql.com/commits/82760
X-Bug: 45588
Message-Id: <0KPO00HYZVRLNYK0@mail-apac.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_a3CU2bylcfsH33uYQvwb7A)"

--Boundary_(ID_a3CU2bylcfsH33uYQvwb7A)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#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,


--Boundary_(ID_a3CU2bylcfsH33uYQvwb7A)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/jack@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/jack@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jack@stripped
# target_branch: file:///D:/repo/nodaemon45588/
# testament_sha1: da9656d09e0b612834e1b01c3edaaa7f6ea6fb39
# timestamp: 2009-09-09 15:40:25 +1000
# source_branch: bzr+ssh://jandrews@stripped/bzrroot\
#   /server/mysql-5.1-telco-7.0/
# base_revision_id: jack@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZkifTEAAbFfgEAQWWf//3Ol
lIC////yUAQY8XY6WxlLOxwkophGSeieptNqnkyT0ymEDTQANDTQSUU2im2SZoJqGaj1Bo0AAAAA
01BMUYAFNlAA0aGjQbUMIA5gAJkwAJhMEwhgCMACSQmiZMIepo0mKeCSfompm1TbVMjT9Rk1I1iy
i+MnFgsqqGOl6LBSQ3VQWxAH5nSMe0yhFpq2O2trGqsoTWEFPsA5r6FKQ1grLgMY4W/f5raFRTDM
XMU25s0Fb4uU+5AlIdCSYUjrwvs3bVLuoMWhArJcsBMNzeg2mNvuOA4n1OpZGai/MZq0HtqzKWl5
+fKywV7vmrYXcULjAdx29EbJ4oG3uA+bPW7xxsCnE5SJlnJpknDJ7CZMJhcycgT83kTsZSF4uAVh
QwwXb555QkjXJa9QgihHnpinr15RSK/Rg0PB7pi4OHQ8WDU84LM0d1CsreVFZaSRY1NDE3HORF16
vtGjhZSlUG0W66Jtx4rhisHuHmx5eTdMmBNPrdaZA9e+vVK8ncdbcc/crBwoSsWIkMPLmNIwYXrB
42SuRSPx0vJ9SnP247+nsYH9CvoOtcmG27w0VrQZGkZEuGuPXCsSpR1J0Y4zyRR1FNxLjGhOKQBX
r+WZRPkxIEXkZqnDFSg8yhN5HonMLqxzxzDVDeGb+GHss/2OWp8ziLOe/QI9iuYGHH4tf9Tsfo5H
cex6kw8ccD4PwwnIPnA4EqolFuNbXp90HOyGweDYaDUXV+Fpx0kknf262CLOMsNaJVn6bzO7G65l
AsqmMa1KPKFzDLj9+9Up89vgjWW1lR9C9lL+/oRiW9DFh94jmEUDv8EWjLiatg2/LdvlBOLFeQTs
YqxwWaR5bB0uqpzHoQfWWl5Axbcp9ymTcKyCOGf7Y9HJZ7x/ZMjjdXulQGmgx5FBEIvq9kcpi5pY
TDw8Rm+utEtLU0u0W+tCUPKnzLxcKoWYtyQC6AbSDI8VVCplGOYZQa2yowUbRTG41bAea+5U6wrd
22vjnAw8twsHgfjfzLlRXlPHiyo+hqZArehWR1CvCLcwNHiynpiWeJinqINGg7KtLsV2ERvxTsJl
sJB1vMTquOwcX8xFqgwMnENTdTE1gXnyOlMwQLGfGDsmWDdo8p5rgcyGWBDxMWmGSrAvJdUrhQ3t
KRNQMYK6qSD0XnRUiK1NUc0NEJVSFOQwwwU7jLODBPnisH2wgMm4Zymlt2jbWRF7pNLBVQ5ZpSi8
Mr9ISNFwnaoBYYRMJFpSO3C1bsnAUUQS8Z74MVlADc1OqORJt8dlKpDX5iHW6mzRy8JizvJNk7iL
S3lXEgFCMSrGa5OJmVDjv2dIFWJIiVG+d22FKs+EkGjOLDNC0gJvAeqcWd0BVD38hjzwKfkM7zWM
h1j+2R2M/xdyRThQkJkifTE=


--Boundary_(ID_a3CU2bylcfsH33uYQvwb7A)--