diff options
| author | unknown <tomas@mc05.(none)> | 2004-05-26 14:34:41 +0200 |
|---|---|---|
| committer | unknown <tomas@mc05.(none)> | 2004-05-26 14:34:41 +0200 |
| commit | 284c1b61e01f57a15e44d68c74b7fa9b4163b19e (patch) | |
| tree | 5014419c4be7839f0b7c481edfd36b20dccce21e /ndb/src/ndbapi/Ndb.cpp | |
| parent | b381b7c995d0af0547f42a415082d7d854c65941 (diff) | |
| parent | 93796e9600e4344a5974171b9ea0b5c3eca96e1d (diff) | |
| download | mariadb-git-284c1b61e01f57a15e44d68c74b7fa9b4163b19e.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
configure.in:
Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
Auto merged
ndb/src/ndbapi/Ndb.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi/Ndb.cpp')
| -rw-r--r-- | ndb/src/ndbapi/Ndb.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp index 0304db67a39..fe21b4e02a4 100644 --- a/ndb/src/ndbapi/Ndb.cpp +++ b/ndb/src/ndbapi/Ndb.cpp @@ -825,7 +825,7 @@ Ndb::opTupleIdOnNdb(Uint32 aTableId, Uint64 opValue, Uint32 op) tOperation->interpretedUpdateTuple(); tOperation->equal("SYSKEY_0", aTableId ); { -#ifdef NDB_SOLARIS +#ifdef WORDS_BIGENDIAN Uint64 cacheSize64 = opValue; // XXX interpreter bug on Uint32 tOperation->incValue("NEXTID", cacheSize64); #else @@ -991,7 +991,7 @@ Ndb::StartTransactionNodeSelectionData::release(){ Uint32 convertEndian(Uint32 Data) { -#ifdef _BIG_ENDIAN +#ifdef WORDS_BIGENDIAN Uint32 t1, t2, t3, t4; t4 = (Data >> 24) & 255; t3 = (Data >> 16) & 255; |