Skip to content

M
MariaDB
Commit e29d7c5f authored by unknown's avatar unknown
Browse files
Options

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 

into  debian.(none):/M50/push-5.0
parents a2061153 05a3c69c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sql/ha_ndbcluster.cc
View file @ e29d7c5f
...@@ -733,8 +733,8 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field, ...@@ -733,8 +733,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, pack_len) != 0); DBUG_RETURN(ndb_op->setValue(fieldnr, (char*)&bits, pack_len) != 0);
} }
...@@ -2678,10 +2678,10 @@ void ha_ndbcluster::unpack_record(byte* buf) ...@@ -2678,10 +2678,10 @@ void ha_ndbcluster::unpack_record(byte* buf)
/* lsw is stored first */ /* lsw is stored first */
Uint32 *buf= (Uint32 *)(*value).rec->aRef(); Uint32 *buf= (Uint32 *)(*value).rec->aRef();
((Field_bit *) *field)->store((((longlong)*buf) ((Field_bit *) *field)->store((((longlong)*buf)
& 0x000000000FFFFFFFF) & 0x000000000FFFFFFFFLL)
| |
((((longlong)*(buf+1)) << 32) ((((longlong)*(buf+1)) << 32)
& 0xFFFFFFFF00000000), & 0xFFFFFFFF00000000LL),
TRUE); TRUE);
#else #else
((Field_bit *) *field)->store((longlong) ((Field_bit *) *field)->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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7