Commit cdbe7302 authored by unknown's avatar unknown
Browse files

correction of manual merge

parent cba5f9d9

sql/ha_ndbcluster.cc

+8 −8
Original line number Diff line number Diff line
@@ -3159,14 +3159,14 @@ 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)

            field_bit->Field_bit::store((((longlong)*buf)

                                         & 0x000000000FFFFFFFF)

                                        |

                                        ((((longlong)*(buf+1)) << 32)

                                         & 0xFFFFFFFF00000000),

                                        TRUE);

#else

            ((Field_bit *) *field)->store((longlong)

            field_bit->Field_bit::store((longlong)

                                        (*value).rec->u_64_value(), TRUE);

#endif

          }