bk commit into 6.0-falcon tree (hakank:1.2579)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of hakan. When hakan does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-06-19 14:57:13+02:00, hakank@stripped +1 -0
  Compile fix for Linux 32-bit. Thanks to Sergey Vojtovich for pointing out.

  storage/falcon/BigInt.cpp@stripped, 2007-06-19 14:57:04+02:00, hakank@stripped +7
-7
    Compile fix for Linux 32-bit. Thanks to Sergey Vojtovich for pointing out.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	hakank
# Host:	lu0008.wdf.sap.corp
# Root:	/home/hakan/work/mysql/mysql-5.1-falcon

--- 1.12/storage/falcon/BigInt.cpp	2007-06-19 14:57:25 +02:00
+++ 1.13/storage/falcon/BigInt.cpp	2007-06-19 14:57:25 +02:00
@@ -30,7 +30,7 @@ static const char THIS_FILE[]=__FILE__;
 #endif
 
 #define MPBASE 32
-#define B 0x100000000 // Number base (MPBASE bits)
+#define B 0x100000000ull // Number base (MPBASE bits)
 
 static BigInt* powerTable[maxPowerOfTen];
 static bool powerTableInit;
@@ -491,12 +491,12 @@ int BigInt::nlz(uint64 x)
 
    if (x == 0) return(64);
    n = 0;
-   if (x <= 0x00000000FFFFFFFF) {n = n + 32; x = x << 32;}
-   if (x <= 0x0000FFFFFFFFFFFF) {n = n + 16; x = x << 16;}
-   if (x <= 0x00FFFFFFFFFFFFFF) {n = n + 8;  x = x << 8;}
-   if (x <= 0x0FFFFFFFFFFFFFFF) {n = n + 4;  x = x << 4;}
-   if (x <= 0x3FFFFFFFFFFFFFFF) {n = n + 2;  x = x << 2;}
-   if (x <= 0x7FFFFFFFFFFFFFFF) {n = n + 1;}
+   if (x <= 0x00000000FFFFFFFFull) {n = n + 32; x = x << 32;}
+   if (x <= 0x0000FFFFFFFFFFFFull) {n = n + 16; x = x << 16;}
+   if (x <= 0x00FFFFFFFFFFFFFFull) {n = n + 8;  x = x << 8;}
+   if (x <= 0x0FFFFFFFFFFFFFFFull) {n = n + 4;  x = x << 4;}
+   if (x <= 0x3FFFFFFFFFFFFFFFull) {n = n + 2;  x = x << 2;}
+   if (x <= 0x7FFFFFFFFFFFFFFFull) {n = n + 1;}
    return n;
 }