From: magnus.blaudd
Date: June 15 2011 2:39pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4459)
List-Archive: http://lists.mysql.com/commits/139250
Message-Id: <20110615143935.7793B13402B@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3691602651687739595=="

--===============3691602651687739595==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/msvensson/mysql/7.0-bug12352191/ based on revid:magnus.blaudd@stripped

 4459 magnus.blaudd@stripped	2011-06-15
      ndb
       - fix compiler warnings about unused calculated value

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-06-01 07:40:49 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-06-15 14:39:31 +0000
@@ -1486,11 +1486,11 @@ int MgmtSrvr::shutdownMGM(int *stopCount
     error= sendStopMgmd(nodeId, abort, true, false,
                         false, false);
     if (error == 0)
-      *stopCount++;
+      (*stopCount)++;
   }
 
   *stopSelf= 1;
-  *stopCount++;
+  (*stopCount)++;
 
   return 0;
 }


--===============3691602651687739595==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   i2bg2pw02zh8zg8d
# target_branch: file:///home/msvensson/mysql/7.0-bug12352191/
# testament_sha1: 47d25b3eb9e4f31714d6902edf6cd1f96ab71e7f
# timestamp: 2011-06-15 16:39:35 +0200
# base_revision_id: magnus.blaudd@stripped\
#   j0kof1ltf9m1h98i
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWadoALoAAYDfgBAQUHv//1oC
CAC////wUAODu97RNqRve27hKJTxUeAKeUfko2SDBGhoPKMgSSTQ0aaT0JtU9T0U/UmmgGgDTQBK
IEyBTZE9BNlMTT1PSAADQZIJPJAxHqAAMmmgAABJUaaTEwCZNGQ09RHqGjQABlt8BePHadb7TYpd
UyhAg+EGxlZfYjBZGW7aFVUr4Bk3oUwWkZO1W5XcuGPxzdX+KhTo0Rszype7eMUTwiaZjxMTWOnM
xDlReJXLqT7M8IW4D5ZcBCGkQvTqqmbNi0l9SlCczoCFfQbQEhWCJAEesKQoYi1XkZ4h7SgJKjRG
b5HnIQndoM2LhBjfxsas8/vYWI9Ab2WIZS2oO3XtuotJo7rcWHFcFTHmRPCHhjDZqt1k74Qj5trV
c+wMrK5i43FuKMdDCNZUKRVyjAHsLl4v+BbmhEKCmhBhSjjg5Nqoi18S+GEAkoNga9LcHK9A/rpl
k/Ba1XQcf2+QihlJ/DRjIGIegoPgfPw2tVMdFcR45llIYHXspnepGJ8m5W7R6ScRc1tTguKR1ulh
Qs4RW0QkLEwrYgKa7axs4wWBzses785sSxnBYXMBjGDYNRYK8iD5lyPI5VEuFyY+3e0QhFRRfrIZ
NPJWoXrLS4vmwcFzlFTmwvp5CGZ1N0emuZDERS7OyyHKhHNsZxeeEOrpiKqTIbXkaOT7TRoaLPMR
f09/cjt16T6F+RrvgzCJJErnLWZkmO9pzc++KjYn2KgRiwbQIYRM3mBtI+6+kEzMqt06W9IO+o3O
nt75DsYIzkdnOHuzup6dGexttpbBq8nHB4JlnbLnOON5WQBk7E3UiRSxZlC88uvBqx3HibdRai3F
p+2HCLySjGqIVyg2BeUTTjqwkOQr4idn6nnKGo2Lcwv6hLJ64VwWBnIODCZrql6SRTmw1BScRyv/
ngmCZ8MMRGXKUQ8n7m6OCg5iOxS2LqeQ8+OUhFFBKatRsfCAzIP3XJXGKnBYvCNDmlFW0rNSD1Ss
Qa1H429NSRQR4elm8fsFqHXCDUJkrYjuZg1IYo4jBULBbYpA+AdKYOpFANi4keLDQUKyTK1pD9Mw
mDsj0mtbY98/NRiZ7RCUn8YvrwUpqBYpo3blx3w2TFJzKAnXQaiyrcjJGexarZnkTcHq6OuklRJk
kVqpOQoyjpETb9w7ncVFlVCQxpppaQwq4IE/IL2bhX8kZGukZZCq64cwdpL6f4u5IpwoSFO0AF0A


--===============3691602651687739595==--