From: Kent Boortz
Date: June 10 2011 12:17pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (kent.boortz:4217)
List-Archive: http://lists.mysql.com/commits/139060
Message-Id: <20110610121746.27838.qmail@helheim>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1867234809=="

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

#At file:///net/helheim/store/bteam/bzr/mysql-7.1.14-release/ based on revid:jonas@stripped

 4217 Kent Boortz	2011-06-10
      Added missing return of value in read_lock()

    modified:
      storage/ndb/src/kernel/vm/NdbSeqLock.hpp
=== modified file 'storage/ndb/src/kernel/vm/NdbSeqLock.hpp'
--- a/storage/ndb/src/kernel/vm/NdbSeqLock.hpp	2011-05-17 07:06:30 +0000
+++ b/storage/ndb/src/kernel/vm/NdbSeqLock.hpp	2011-06-10 12:17:35 +0000
@@ -86,7 +86,7 @@ struct NdbSeqLock
   void write_lock() {}
   void write_unlock() {}
 
-  Uint32 read_lock() {}
+  Uint32 read_lock() { return 0; }
   bool read_unlock(Uint32 val) const { return true;}
 };
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kent.boortz@stripped
# target_branch: file:///net/helheim/store/bteam/bzr/mysql-7.1.14-\
#   release/
# testament_sha1: b96c29b5cf90f9388f18911b8a89040502ed23fd
# timestamp: 2011-06-10 14:17:46 +0200
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQkXl78AAXPfgAAQUGP//3IN
CgC////6UANa5nKu3rGpzsJRFNJ4m0SbTRhGU9Gpk09TTCaaaMglImhpPEyNETT1NNPSAAAGhoJJ
CaMTRU/Cp5qJ6aj1NNA9TCMgGDKIZNTymmm1AGgAAAHqACSiMiaTehNT2qbSep6TZQANGgBlN3m3
hXEzxes65UAz0k+MHQa3HsmzMeB9l+YRns9me9nd6a/j33tWN3VmVvjlgDlPrpl6+MuiTaMUSUy6
NRWQn4iCU+cAtX5oMBXTO961SktApJoNFVsbtEgLUppIMRM1g15wkRgFKwUFEGGJEEFijUVcLnyK
cMo1sBRsxZxc5At5rK8FO1QsglR9eU+8rouM5cFmLLW7Ds3Gor5E75av223guGtBYKOSvXTDdlaF
9w75Zx6HN9BWe2NRpYbyYjYkHakk4jc2wYa948aorSC1phQmBhkTiOCqSr6SVhdDZ+wEG1JaKRxV
ElMgW6EsNYbZNLxSWjsNGfPTFf5WFovPeK2mFi9Sr1OFxMS5Rhz3BKSMpim6BaU0pEUvjWoljhFY
+uEnahQw0NHOWyMHxW+qvNrk2dG2hdAfVrKgzOIDk0WgWhG1odxOzGQbJUu5bqw4IlUESop9ubg1
Q2POwyUsCQV17w/RPgCtDVgMvoJ0Hb1Ii4JXBiGSP5+F91Wb0GA6ASE3ba3YZh5h3JXyEtAsA6ce
QtKRZF1jSg7Xc0nehrUqkQkuJMtyxvyZToelKKWlhimb5iflafbNxrbZPkHr26VA26oM2I3XvPD5
dTn14hkUKFZC30dER89Mz64lngbWq9GGB3ZeCIvsip/REmaZvlVVOQCYUZVH5+8pcbrNJEae2z4e
oYazM3PCJa20oC8fXckSaSgz0kPHwivSGRGGQrDPTw+o6XOCoNhFSR3G2cK36kvc3DHaLUb0XBGA
RtQ9LIkRRvGPLab4Bw4Zh6bRCdedqQXCPj82Ms0UOcv8H0DHBMwNAppQpu1vncZX46kErAYxMV8o
qzgw8M1V4KcN4R+fJKYilSiCy0gSJjVdjDWxk8sxj91wj2nWLaiGOplMFlCp0RQ4l1uLuMlePyhi
+xB2suSoFtYvwK4MUj0g65c/d/EQpFrgk1OQgpW8ep8zOq7ZYUNQsBike8uYBHG9/YbFukZ3WroI
BbCakW2tPTlsRnsFOAx42wU1UDiLuSKcKEgEi8vfgA==


--===============1867234809==--