diff options
| author | joerg@trift-lap.fambruehe <> | 2007-04-26 16:03:02 +0200 |
|---|---|---|
| committer | joerg@trift-lap.fambruehe <> | 2007-04-26 16:03:02 +0200 |
| commit | f723388b181069a182f6ec2b1db6e1796ae4fc2d (patch) | |
| tree | 4b1fb8318b8c9ab33f05bda09d8353120cf57a4c /sql/ha_ndbcluster.cc | |
| parent | c6f625bdbc0936ec9a72b3a5905513a4dea05e9b (diff) | |
| parent | fcea1c66e21e264a1175a6c3265b1087175b849b (diff) | |
| download | mariadb-git-f723388b181069a182f6ec2b1db6e1796ae4fc2d.tar.gz | |
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
into trift-lap.fambruehe:/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 7f5c1cfd494..8fd9dd0354c 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -738,8 +738,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); } @@ -3222,10 +3222,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) |