diff options
| -rw-r--r-- | ndb/include/ndbapi/NdbRecAttr.hpp | 7 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbRecAttr.cpp | 23 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 9 |
3 files changed, 15 insertions, 24 deletions
diff --git a/ndb/include/ndbapi/NdbRecAttr.hpp b/ndb/include/ndbapi/NdbRecAttr.hpp index 2f3a2c8383a..7f8add774dc 100644 --- a/ndb/include/ndbapi/NdbRecAttr.hpp +++ b/ndb/include/ndbapi/NdbRecAttr.hpp @@ -336,10 +336,7 @@ inline Int32 NdbRecAttr::medium_value() const { - Uint32 tmp = *(Uint32*)theRef; - if (tmp & (0x1<<23)) - tmp|= (0xFF<<24); - return (Int32)tmp; + return sint3korr((unsigned char *)theRef); } inline @@ -367,7 +364,7 @@ inline Uint32 NdbRecAttr::u_medium_value() const { - return *(Uint32*)theRef; + return uint3korr((unsigned char*)theRef); } inline diff --git a/ndb/src/ndbapi/NdbRecAttr.cpp b/ndb/src/ndbapi/NdbRecAttr.cpp index a0c394603c5..90808a706d4 100644 --- a/ndb/src/ndbapi/NdbRecAttr.cpp +++ b/ndb/src/ndbapi/NdbRecAttr.cpp @@ -236,24 +236,13 @@ ndbrecattr_print_formatted(NdbOut& out, const NdbRecAttr &r, break; case NdbDictionary::Column::Bit: out << f.hex_prefix << "0x"; - if (length < 33) { - out.print("%X", r.u_32_value()); - } - else if (length < 65) - { - out.print("%llX", r.u_64_value()); - } - else - { - const unsigned char *buf = (unsigned char *)r.aRef(); - int k = 4*((length+31)/32); - while (k > 0 && (*(buf + --k) == 0)); - do - { - out.print("%X", (Uint32)*(buf + k--)); - } - while (k >= 0); + const Uint32 *buf = (Uint32 *)r.aRef(); + int k = (length+31)/32; + while (k > 0 && (buf[--k] == 0)); + out.print("%X", buf[k]); + while (k > 0) + out.print("%.8X", buf[--k]); } break; case NdbDictionary::Column::Unsigned: diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 9bd220ab179..5c7ba12a5da 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -727,7 +727,8 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field, DBUG_DUMP("value", (char*)&bits, pack_len); #ifdef WORDS_BIGENDIAN /* store lsw first */ - bits = (bits >> 32) | (bits << 32); + bits = ((bits >> 32) & 0x00000000FFFFFFFF) + | ((bits << 32) & 0xFFFFFFFF00000000); #endif DBUG_RETURN(ndb_op->setValue(fieldnr, (char*)&bits, pack_len) != 0); } @@ -2653,7 +2654,11 @@ void ha_ndbcluster::unpack_record(byte* buf) #ifdef WORDS_BIGENDIAN /* lsw is stored first */ Uint32 *buf= (Uint32 *)(*value).rec->aRef(); - ((Field_bit *) *field)->store(*buf | (((longlong)*(buf+1)) << 32), + ((Field_bit *) *field)->store((((longlong)*buf) + & 0x000000000FFFFFFFF) + | + ((((longlong)*(buf+1)) << 32) + & 0xFFFFFFFF00000000), TRUE); #else ((Field_bit *) *field)->store((longlong) |