From: Martin Zaun
Date: February 21 2011 5:40pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (martin.zaun:4212)
List-Archive: http://lists.mysql.com/commits/131796
Message-Id: <201102211742.p1LGuXUi026149@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7616261505413669224=="

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

#At file:///Users/mz/mysql/ndb-7.0/ based on revid:jonas@stripped

 4212 Martin Zaun	2011-02-21 [merge]
      merge from ndb-6.3 to ndb-7.0

    modified:
      storage/ndb/include/util/NdbTypesUtil.hpp
=== modified file 'storage/ndb/include/util/NdbTypesUtil.hpp'
--- a/storage/ndb/include/util/NdbTypesUtil.hpp	2011-02-19 02:47:10 +0000
+++ b/storage/ndb/include/util/NdbTypesUtil.hpp	2011-02-21 17:39:23 +0000
@@ -435,13 +435,11 @@ NDB_SPECIALIZE_NUM_TYPE_HELPER(Huint64, 
 // specialize the Helper template members for non-standard numeric types
 #define NDB_SPECIALIZE_NON_STD_NUM_TYPE_HELPER( H, T, INT3KORR )        \
   template<> inline void H::load(T * t, const char * s) {               \
-    assert(t); assert(s);                                               \
-    assert(t > (const T *)s);                                           \
+    assert(t); assert(s); assert(t != (const T *)s);                    \
     *t = (INT3KORR(s));                                                 \
   }                                                                     \
   template<> inline void H::store(char * t, const T * s) {              \
-    assert(t); assert(s);                                               \
-    assert(((T *)t > s) || ((T *)t < s));                               \
+    assert(t); assert(s); assert((const T *)t != s);                    \
     int3store(t, (*s));                                                 \
   }
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-7.0/
# testament_sha1: ff558043e7edfae7bb552e0f3f2d7e5feb9dd858
# timestamp: 2011-02-21 09:40:47 -0800
# source_branch: file:///Users/mz/mysql/ndb-6.3/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU3WTS0AAoT/gEAQQABwc///
UgMGFL////BQBO9XLq2E5q5aHaysEkiEyaZNSfkZqnkRiT2qepj0keUaDagSiKmzTIm1PST2mqAH
qGgAAABIkmmjSp+CSM1D9T0ieoAAADQOYAAAAAAAAAAEkiYgIzSZJ6NTFPVH5TKYRgT1MNR5Z3nA
bp1MisuzWPQ4qi0CitcLXbAeSQjeTPqEnmp6HO3sfDT3zYZg+3yRdXAqi3XC+D23NOJQ90IvsJhi
oPjTu69h/3r99v7eFzGF5VX4f546yVO8XJapeLORv/KcN5FC+xUTBHQ1Px/oX812DobDNBianHwU
i/qIptiJpJrAA6HWyI4XTQXVUOXSZiRJJGsjtDLmoUTzkiEc2P2zJEdqtv8l2IKKrsM6e/ASNMw3
4HAwEiyjEThkJxEvVZGvdR4HyooZeKG6MHtMiBKT3o5gxESciJmvxbitYRstXSut23KlGLWtBI2J
BvEjOKCOXCHg5yVJgXWEdzhVXjQ4S026sUPylKkCGiS4Mbheo+JHdexaooDckCkGvlfY4L7bwgCG
6uNFOWEuD1taZs521y2FIMdwoExS3qNB7dC3eHi/CUgvW60shDbBVkjKmozNvgMQf+LYxtKthCh6
Ka+PUzzib76NKVu4heZEkQ9ZkMMgxGxeUQQqQpoFUcyhKLEomJ1/aDA5Wbq3XPGKxjoWqkpD2J5u
HgxnMLYFUyiyFpoOQdEGCDST6CvHRRfOLUFhPbhMniW5EMplqZ4B1ysClhcSGVMCJGI5lwmKcEky
UyEMtHJUFTMMZCyWo6GJQT2awxOu8+oowCeVMwMe7uRLQWyuPwTGamRyTSbIiKMeK0wqw3M4bnbD
liAaJtKua8gl778B50rA9DgARFmH3Gej8kwDA75I/nSg7BCSyzGVSJ+2GeO9O1R+yYjNwE8+yjRn
Gx44tRuk8mRPPiZXVOGAH/ESJnzPj2x3duxpOaNhK4J8M0ghA2RySscPCFY0MfthRTKcdcUaED12
d3kqAVDBTVZPEwJFvLz3lZ1KrLrkTPjfXc6aRN5hmsxUoquI0uUPQcHRZr1EyNuOwx9gGxcB4SeM
lUEQtjIYT7WvL+KkrgoVL+8PMpWDlwOjnFKCjVpQb62XQgEEDtBc6o6/U8lLepo5mqttQNieJ6gx
A1TBxTBmwghsFZ58DEeXJTS4Fj+/3CapF3yksHFZtFy5CZVAWpWjgHyAGPHaeRcSI8UI1GL/qe4Z
wMOdkaoterg1W8qO6iRX7FK8YiMAZtugiwAZqbwK8olK9vi9daFtTpW2imPQRsjeOFsqss8gdcAp
EuYuQ8iXirgCYCqPDAsuSoWMY9DlTj1DaNVNfmjY3UhbqvJb1FE0GewVS+HLQIBQkjsNQBzrOpiq
fcgaEkb83zPNBFBYIJYsL0s9pAUbJjja5Juoxdag7Eoobsb5+IVTBLrIKiwiGQsc7cjYVhcWD9ZA
YhaYHckYwOXqxtB4g1psAtSoZGRqPpMqO8pEE1rGc5MKjWlIeXPINvdjOvBb84FYq+MF2vMRZu7I
ApHlqD/i7kinChIJusmloA==


--===============7616261505413669224==--