3317 Martin Zaun 2010-10-21 [merge]
merge from ndb-6.3-int64constants to ndb-6.3
modified:
storage/ndb/include/ndb_types.h.in
3316 Jonas Oreland 2010-10-21
ndb - fix a (very) sporadic crash when event->subscribe() is performed on a table being dropped. Seen in ndb_binlog_variants and autotest
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-26 18:53:34 +0000
+++ b/storage/ndb/include/ndb_types.h.in 2010-10-22 00:40:27 +0000
@@ -50,6 +50,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/martin.zaun@oracle.com-20101022004432-g4k3vx4c5kvo9nix.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-telco-6.3 branch (martin.zaun:3316 to 3317) | Martin Zaun | 22 Oct |