Skip to content

M
MariaDB
Commit 71ec671d authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files
Options

correction of manual merge

parent d4982247
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
sql/ha_ndbcluster.cc
View file @ 71ec671d
...@@ -3159,15 +3159,15 @@ void ndb_unpack_record(TABLE *table, NdbValue *value, ...@@ -3159,15 +3159,15 @@ void ndb_unpack_record(TABLE *table, NdbValue *value,
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
/* 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_bit::store((((longlong)*buf)
& 0x000000000FFFFFFFF) & 0x000000000FFFFFFFF)
| |
((((longlong)*(buf+1)) << 32) ((((longlong)*(buf+1)) << 32)
& 0xFFFFFFFF00000000), & 0xFFFFFFFF00000000),
TRUE); TRUE);
#else #else
((Field_bit *) *field)->store((longlong) field_bit->Field_bit::store((longlong)
(*value).rec->u_64_value(), TRUE); (*value).rec->u_64_value(), TRUE);
#endif #endif
} }
/* /*
......
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