Commit 30dd2250 authored by joerg@trift2's avatar joerg@trift2

Merge trift2.:/MySQL/M50/fix-ndb-5.0

into  trift2.:/MySQL/M51/push-5.1
parents dc981fc2 5fc30d25
...@@ -737,8 +737,8 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field, ...@@ -737,8 +737,8 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field,
DBUG_DUMP("value", (char*)&bits, pack_len); DBUG_DUMP("value", (char*)&bits, pack_len);
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
/* store lsw first */ /* store lsw first */
bits = ((bits >> 32) & 0x00000000FFFFFFFF) bits = ((bits >> 32) & 0x00000000FFFFFFFFLL)
| ((bits << 32) & 0xFFFFFFFF00000000); | ((bits << 32) & 0xFFFFFFFF00000000LL);
#endif #endif
DBUG_RETURN(ndb_op->setValue(fieldnr, (char*)&bits) != 0); DBUG_RETURN(ndb_op->setValue(fieldnr, (char*)&bits) != 0);
} }
...@@ -3202,10 +3202,10 @@ void ndb_unpack_record(TABLE *table, NdbValue *value, ...@@ -3202,10 +3202,10 @@ void ndb_unpack_record(TABLE *table, NdbValue *value,
/* lsw is stored first */ /* lsw is stored first */
Uint32 *buf= (Uint32 *)(*value).rec->aRef(); Uint32 *buf= (Uint32 *)(*value).rec->aRef();
field_bit->Field_bit::store((((longlong)*buf) field_bit->Field_bit::store((((longlong)*buf)
& 0x000000000FFFFFFFF) & 0x000000000FFFFFFFFLL)
| |
((((longlong)*(buf+1)) << 32) ((((longlong)*(buf+1)) << 32)
& 0xFFFFFFFF00000000), & 0xFFFFFFFF00000000LL),
TRUE); TRUE);
#else #else
field_bit->Field_bit::store((longlong) field_bit->Field_bit::store((longlong)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment