1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correction of manual merge

Browse Source
This commit is contained in:
tomas@whalegate.ndb.mysql.com 2007-03-26 21:10:34 +02:00
parent d4982247cf
commit 71ec671d4d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sql/ha_ndbcluster.cc
View File

@ -3159,15 +3159,15 @@ void ndb_unpack_record(TABLE *table, NdbValue *value,
#ifdef WORDS_BIGENDIAN
/* lsw is stored first */
Uint32 *buf= (Uint32 *)(*value).rec->aRef();
((Field_bit *) *field)->store((((longlong)*buf)
& 0x000000000FFFFFFFF)
|
((((longlong)*(buf+1)) << 32)
& 0xFFFFFFFF00000000),
TRUE);
field_bit->Field_bit::store((((longlong)*buf)
& 0x000000000FFFFFFFF)
|
((((longlong)*(buf+1)) << 32)
& 0xFFFFFFFF00000000),
TRUE);
#else
((Field_bit *) *field)->store((longlong)
(*value).rec->u_64_value(), TRUE);
field_bit->Field_bit::store((longlong)
(*value).rec->u_64_value(), TRUE);
#endif
}
/*