diff options
| author | Chad MILLER <chad@mysql.com> | 2008-07-10 14:47:53 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-07-10 14:47:53 -0400 |
| commit | 6a6e77eeffc7dbd72888ef685fdb93fc2ae7aed6 (patch) | |
| tree | d78d316822f255f22093dc0cc26ea8943b5f91d4 /ndb/src/kernel/vm/pc.hpp | |
| parent | 5e0d806d276d27fef1a5dfcdca92f010836510ed (diff) | |
| parent | 1aaa63aabaef8015c71fc6143b3062e197049707 (diff) | |
| download | mariadb-git-6a6e77eeffc7dbd72888ef685fdb93fc2ae7aed6.tar.gz | |
Merge chunk from trunk.
Diffstat (limited to 'ndb/src/kernel/vm/pc.hpp')
| -rw-r--r-- | ndb/src/kernel/vm/pc.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ndb/src/kernel/vm/pc.hpp b/ndb/src/kernel/vm/pc.hpp index 269719c44d0..ed592620a2e 100644 --- a/ndb/src/kernel/vm/pc.hpp +++ b/ndb/src/kernel/vm/pc.hpp @@ -49,7 +49,7 @@ theEmulatedJamBlockNumber = number(); \ Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \ *(Uint32*)(theEmulatedJam + tEmulatedJamIndex) = \ - ((theEmulatedJamBlockNumber << 20) | line); \ + ((theEmulatedJamBlockNumber << 20) | (line)); \ theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; } #else @@ -72,7 +72,7 @@ theEmulatedJamBlockNumber = number(); \ Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \ *(Uint32*)((UintPtr)theEmulatedJam + (Uint32)tEmulatedJamIndex) = \ - ((theEmulatedJamBlockNumber << 20) | line); \ + ((theEmulatedJamBlockNumber << 20) | (line)); \ theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; } #endif @@ -232,7 +232,7 @@ #define MEMCOPY_PAGE(to, from, page_size_in_bytes) \ memcpy((void*)(to), (void*)(from), (size_t)(page_size_in_bytes)); #define MEMCOPY_NO_WORDS(to, from, no_of_words) \ - memcpy((to), (void*)(from), (size_t)(no_of_words << 2)); + memcpy((to), (void*)(from), (size_t)((no_of_words) << 2)); template <class T> struct Ptr { |