diff options
| author | joerg@trift2. <> | 2007-04-18 16:52:05 +0200 |
|---|---|---|
| committer | joerg@trift2. <> | 2007-04-18 16:52:05 +0200 |
| commit | 30dd22503e0c39df96b2ebb114298f2bcaa5e372 (patch) | |
| tree | 708cb99a76fe6581ed61fe458e5978b968372e58 /sql/ha_ndbcluster.cc | |
| parent | dc981fc2dcdddf3d337ad42830cf41069c0aebea (diff) | |
| parent | 5fc30d25ea1f6273534fa721798e4b2ee359a990 (diff) | |
| download | mariadb-git-30dd22503e0c39df96b2ebb114298f2bcaa5e372.tar.gz | |
Merge trift2.:/MySQL/M50/fix-ndb-5.0
into trift2.:/MySQL/M51/push-5.1
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 5a0f27073d4..445dd941352 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -737,8 +737,8 @@ int ha_ndbcluster::set_ndb_value(NdbOperation *ndb_op, Field *field, DBUG_DUMP("value", (char*)&bits, pack_len); #ifdef WORDS_BIGENDIAN /* store lsw first */ - bits = ((bits >> 32) & 0x00000000FFFFFFFF) - | ((bits << 32) & 0xFFFFFFFF00000000); + bits = ((bits >> 32) & 0x00000000FFFFFFFFLL) + | ((bits << 32) & 0xFFFFFFFF00000000LL); #endif DBUG_RETURN(ndb_op->setValue(fieldnr, (char*)&bits) != 0); } @@ -3202,10 +3202,10 @@ void ndb_unpack_record(TABLE *table, NdbValue *value, /* lsw is stored first */ Uint32 *buf= (Uint32 *)(*value).rec->aRef(); field_bit->Field_bit::store((((longlong)*buf) - & 0x000000000FFFFFFFF) + & 0x000000000FFFFFFFFLL) | ((((longlong)*(buf+1)) << 32) - & 0xFFFFFFFF00000000), + & 0xFFFFFFFF00000000LL), TRUE); #else field_bit->Field_bit::store((longlong) |