List:Commits« Previous MessageNext Message »
From:lars-erik.bjork Date:March 26 2009 12:13pm
Subject:bzr commit into mysql-6.0-falcon-team branch (lars-erik.bjork:3079) Bug#40950
View as plain text  
#At file:///home/lb200670/mysql/40950/ based on revid:jstarkey@stripped

 3079 lars-erik.bjork@stripped	2009-03-26
      Follow-up patch to the patch for bug#40950
      
      The constant 0x8000000000000000 broke compilation on 32-bit platforms. Have changed this to
      
      LL(0x8000000000000000) in ha_falcon.cpp and 0x8000000000000000ULL in StorageDatabase.cpp
      modified:
        storage/falcon/StorageDatabase.cpp
        storage/falcon/ha_falcon.cpp

per-file messages:
  storage/falcon/StorageDatabase.cpp
    Made it compliable on 32-bit platforms
  storage/falcon/ha_falcon.cpp
    Made it compliable on 32-bit platforms
=== modified file 'storage/falcon/StorageDatabase.cpp'
--- a/storage/falcon/StorageDatabase.cpp	2009-03-25 22:37:22 +0000
+++ b/storage/falcon/StorageDatabase.cpp	2009-03-26 12:13:06 +0000
@@ -1039,7 +1039,7 @@ int StorageDatabase::getSegmentValue(Sto
 			// value as a BigInt, if it is not set, we 
 			// can use int64
 
-			if (temp & 0x8000000000000000)
+			if (temp & 0x8000000000000000ULL)
 				{
 				BigInt bigInt;
 				bigInt.set(temp);

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2009-03-24 13:31:43 +0000
+++ b/storage/falcon/ha_falcon.cpp	2009-03-26 12:13:06 +0000
@@ -3016,7 +3016,7 @@ void StorageInterface::encodeRecord(ucha
 					// encode it as a BigInt to support unsigned values 
 					// with the MSB set in the index
 
-					if (((Field_num*)field)->unsigned_flag && (temp & 0x8000000000000000))
+					if (((Field_num*)field)->unsigned_flag && (temp & LL(0x8000000000000000)))
 						{
 						BigInt bigInt;
 						bigInt.set((uint64)temp);

Thread
bzr commit into mysql-6.0-falcon-team branch (lars-erik.bjork:3079) Bug#40950lars-erik.bjork26 Mar