From: magnus.blaudd
Date: June 16 2011 9:32am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4458)
List-Archive: http://lists.mysql.com/commits/139304
Message-Id: <20110616093235.00EE213402B@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7591316923248387075=="

--===============7591316923248387075==
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/ based on revid:magnus.blaudd@stripped

 4458 magnus.blaudd@stripped	2011-06-16
      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-16 09:32:30 +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;
 }


--===============7591316923248387075==
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\
#   esiov1p02v1uvhgo
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 79087bc8247ff75cf64153f7ea87859b36684cbf
# timestamp: 2011-06-16 11:32:34 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   dbk6ohy028smgsb7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaxFNWYAAXhfgBAQUHv//1oC
CAC////wUAN0zST3dWOVbCUkZU3qaehNTT1H5KfoEmjQAHlG1MJJFJ6nk8QZASntKMm1GgNBpoAk
kAKnpk0JtTT0pieJPFNDQAMYaGgAAA0AAAAAJKKelPNDUaniaYhqemoyNGgAMjqbaDeXkxjpTwZY
3Okg0jppw1g6F6cmLGn1kzMr/kGS9SiKqCRy1Ly8uXpd86M2/qkKJZX1Z5UWs8SRQmLy1xvLzgMc
ZiHKdAp1/hnb11xN+stEOyIhBKqJlvvYi8bk8T84HJcmEOqshYBVSiIzo60R2uQnpnqFiVIdfySN
AbGXlU+VBFYdpl5wEOezu29rqvXriYJ1qMYTQXz1mWX1wpN5ZuCzd1KmEMOH715EchPC6Q9X7IR1
22qVUSzgKc9xfUVHyObhPV7ded1ehr036AZaCVkOIXJjP3xen7Tv35yV1nGTFdZDjGG93JxWnYdJ
LJ5/O2PGwUnoNWanDeEMAYeXEyzv5L+27Ur590yo40idMyeCyLTWT0/XOvnJRZ91bhiHbHMnh2D7
V1YqI+zKgsV3RG7DRSc9TX4uws0tDgc5xAcmk0CgSm3wPQ56yvDUvP16PESoww346Dp2qz0Zsfrc
WR7XBVYRFZ0zGvPxEQINRvEaMe+mnqxlRlE8wUoQxhe0uKUVgKYwlLvBacRBsb0OE2zpfA2RNz4s
wiSRKtypyWF9tz6eGL5WqtNJ6xEPPFTEcyc+B2lhNxp6gTVJYQk00qK8XQwmJHNQ2z2bmwbXZUoH
55VQbfBx0O5Mp53ZTjt6hQKiwGTqHjzoXHCWZsRPrs3FrDE5EBaP1g0RgKBI5QdS2wKya4V+Blgq
QlNTzPfzTIustWzMavMJn+99TqxHGU0hbCLd7PjgXFyrCg4GrowJwnaGuQRtxmEMTa4o82wRLQvU
+gzjwVCc4WMfA0rKU5juof3bZoHRjxakQpdB5dfuMDJEWV4h71LOCNlHcF3IUw9MeRPiNgR7REET
qhqi5m2YUS8BXXqMutYxOI3NYS1D6VZJwJqmP793FMnpLGMUU8sTEpvqp4v0xjb/sOWrERWsYLhS
WdYTwCITXqrkssmb8o75B50IBBmYxKqOCa9vkaWOhUbHv93Zt1tOKUFY3BlE1l+NoCJbnf1yLyd9
qQ/sLchaYC6imUotQsgmn/eO/Z+ipRXVXNRy+O2phXp7C7kinChIViKaswA=


--===============7591316923248387075==--