bzr push into mysql-5.1-telco-7.0 branch (martin.zaun:3886 to 3887)

[Martin Zaun]

 3887 Martin Zaun	2010-10-21 [merge]
      merge from ndb-6.3 to ndb-7.0

    modified:
      storage/ndb/include/ndb_types.h.in
 3886 Jonas Oreland	2010-10-21 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
      storage/ndb/src/kernel/blocks/ERROR_codes.txt
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
=== modified file 'storage/ndb/include/ndb_types.h.in'
--- a/storage/ndb/include/ndb_types.h.in	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/include/ndb_types.h.in	2010-10-22 00:50:16 +0000
@@ -46,6 +46,18 @@ typedef unsigned short Uint16;
 typedef   signed int   Int32;
 typedef unsigned int   Uint32;
 
+#ifndef INT_MIN64
+#define INT_MIN64       (~0x7FFFFFFFFFFFFFFFLL)
+#endif // !INT_MIN64
+
+#ifndef INT_MAX64
+#define INT_MAX64       0x7FFFFFFFFFFFFFFFLL
+#endif // !INT_MAX64
+
+#ifndef UINT_MAX64
+#define UINT_MAX64      0xFFFFFFFFFFFFFFFFLL
+#endif // !UINT_MAX64
+
 typedef unsigned int UintR;
 
 #ifdef __SIZE_TYPE__


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