3633 John David Duncan 2011-11-07 [merge]
merge from local working branch
modified:
storage/ndb/memcache/include/int3korr.h
3632 magnus.blaudd@stripped 2011-11-07
ndb - add missing new line in ndb_share.cc
modified:
sql/ndb_share.cc
=== modified file 'storage/ndb/memcache/include/int3korr.h'
--- a/storage/ndb/memcache/include/int3korr.h 2011-09-12 10:05:07 +0000
+++ b/storage/ndb/memcache/include/int3korr.h 2011-11-07 18:47:48 +0000
@@ -18,8 +18,6 @@
02110-1301 USA
*/
-#ifdef WORDS_BIGENDIAN
-
#define sint3korr(A) ((Int32) ((((Uint8) (A)[2]) & 128) ? \
(((Uint32) 255L << 24) | \
(((Uint32) (Uint8) (A)[2]) << 16) |\
@@ -32,20 +30,4 @@
#define uint3korr(A) (Uint32) (((Uint32) ((Uint8) (A)[0])) +\
(((Uint32) ((Uint8) (A)[1])) << 8) +\
(((Uint32) ((Uint8) (A)[2])) << 16))
-#else
-
-#define sint3korr(A) ((Int32) ((((Uint8) (A)[2]) & 128) ? \
- (((Uint32) 255L << 24) | \
- (((Uint32) (Uint8) (A)[2]) << 16) |\
- (((Uint32) (Uint8) (A)[1]) << 8) | \
- ((Uint32) (Uint8) (A)[0])) : \
- (((Uint32) (Uint8) (A)[2]) << 16) |\
- (((Uint32) (Uint8) (A)[1]) << 8) | \
- ((Uint32) (Uint8) (A)[0])))
-
-#define uint3korr(A) (Uint32) (((Uint32) ((Uint8) (A)[0])) +\
- (((Uint32) ((Uint8) (A)[1])) << 8) +\
- (((Uint32) ((Uint8) (A)[2])) << 16))
-
-
-#endif
+
\ No newline at end of file
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster branch (john.duncan:3632 to 3633) | John David Duncan | 9 Nov |
