diff options
| author | unknown <joerg@debian.(none)> | 2007-04-20 12:31:03 +0200 |
|---|---|---|
| committer | unknown <joerg@debian.(none)> | 2007-04-20 12:31:03 +0200 |
| commit | 515c64875b91c93de45cd4e8a2361327383a36c8 (patch) | |
| tree | 47d004d52f842265cb7a96ee4b590f89e39585d0 /sql/ha_ndbcluster.cc | |
| parent | 4eecb58fd65e77091c930f0a039a59e85d2c1b5d (diff) | |
| parent | ad14c2475b523c39d06767896ae6d98178fcc579 (diff) | |
| download | mariadb-git-515c64875b91c93de45cd4e8a2361327383a36c8.tar.gz | |
Merge debian.(none):/M50/mysql-5.0
into debian.(none):/M50/push-5.0
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
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 8bca5ea7c5c..03e2d5647de 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -733,8 +733,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, pack_len) != 0); } @@ -2678,10 +2678,10 @@ void ha_ndbcluster::unpack_record(byte* buf) /* lsw is stored first */ Uint32 *buf= (Uint32 *)(*value).rec->aRef(); ((Field_bit *) *field)->store((((longlong)*buf) - & 0x000000000FFFFFFFF) + & 0x000000000FFFFFFFFLL) | ((((longlong)*(buf+1)) << 32) - & 0xFFFFFFFF00000000), + & 0xFFFFFFFF00000000LL), TRUE); #else ((Field_bit *) *field)->store((longlong) |