From: Martin Zaun
Date: February 21 2011 5:44pm
Subject: bzr push into mysql-5.1-telco-6.3 branch (martin.zaun:3390 to 3391)
List-Archive: http://lists.mysql.com/commits/131799
Message-Id: <201102211745.p1LFiVYo025319@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4223283661198670676=="

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

 3391 Martin Zaun	2011-02-21
      ndb_restore - fix assert

    modified:
      storage/ndb/include/util/NdbTypesUtil.hpp
 3390 Jonas Oreland	2011-02-21
      ndb - fix race in test_event -n Bug57886 causing spurious core-dumps

    modified:
      storage/ndb/test/ndbapi/test_event.cpp
=== 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));                                                 \
   }
 


--===============4223283661198670676==
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-6.3/
# testament_sha1: ea1b48680f660bc9bcc18cff6214fab78cf7eb6b
# timestamp: 2011-02-21 09:44:20 -0800
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRemyPMAAYb/gEAQQABwc///
UgMGFL////BQA36OyVYEY2hJJNAj1MIGqfqbSZ6lPT1T0mTRkbUxqekOYAAAAAAAAAAGSAmVPNJt
Rk1D1P1JoMQAA0AOYAAAAAAAAAAEoiaaDKPSME9JqmR6JmoaB5Q0GRpfPkL06m4coLFa0DffmNzz
ZTERGGh5nsh3Hyx+OrMy9fMKX0Rqkc0W0yvkonGqD/Zt/86+dvuy0sazNXh8yO7JxzCtn4s5Gvon
DYj1+yg+BGy8+OdeCwzfUXvffPqlwypkmVIFrUPselxvHa6wUiFbIb1Bk9RYrbtL9TokqpX31AGY
0SGNgBzHpCAtdIwdgvR5VnIquwjLF4Hz3EjkvnhB5GyUb6sM8ytMwSKBiCZ5CMyUdtLatyhZtHW4
bbz/ZuEfRJk7VIQmvYIuQmeD5urEREEijlXJJqDJ2aORWXDOG4hY2YiGSrKg+EcLBi54mNItDfpb
60q5hO9gvW05rLbSz+vDZyQKWCovpUTUant9BIk65QgxSIp2D3pAkF2SNfc2uwyICchJA2rSYjTW
VNBXxzYGWOkHyuEnVvakIqXajdRQIoIyhiLSrR4UvXyE8jDoeGwtvxTw69vwRwFtQKfpnjVEuod6
lM9UzkNNtePlJAuMMI5x35uv5eAEKawrejxrsk30o9rwJlqDmNIuloFhjpqF224vXVSbbsZW0PkN
6KZ5hse4o3ONw85XWWUOYCTxSK/Q8o2W77rIZVKondDOSzKUd0Y8GNGergOCj+8fwIl822Ud+4sL
Dhxvm5M6EEcI0wojXg7vucnwlY9mN61HymVWiEQMhfqJ5BglWt/0wyXmzP2EDpH7mVXOI+jZRc4C
jX26RNrDCm/qeKU3BrMssEXdr6orpihwRTFUB0Qt58LmxC4OFre+5Hp3b6Ukys2Bx4oqVhaFrAa8
BSez3xH06CExZdDmKy/RINiaJjW5x6JTtVygLPiIygBZGSjB5ENKW5nNjefhgUQxDqCjlnz4AFgH
gdqw0UOAAwBgdqjZQvDECBOGj8cEQsG8ugo1UOT6XA32GB7eTErIO5FkUjrmOoGprzgq7cC0ARID
pod8dgapsljqnJNFs0BbgdObW4XrJlSiOyBlc5jNXNUbBUFVC8xyuhcd797tfVTYNQONokAaqYaD
XmEO2KBTcxkOTKGoJjj5bbMYzq1W92tdbzFT1eIECTUL/i7kinChIC9NkeY=


--===============4223283661198670676==--