bzr push into mysql-5.1-telco-6.3 branch (martin.zaun:3390 to 3391)

[Martin Zaun]

 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));                                                 \
   }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]