bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3006)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/bug45402/ based on revid:magnus.blaudd@strippedeqww8ksylsxhleu

 3006 Magnus Blåudd	2009-09-14
      ndb - fix compiler warnings

    modified:
      storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
=== modified file 'storage/ndb/include/kernel/signaldata/FsOpenReq.hpp'
--- a/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp	2009-08-21 10:39:15 +0000
+++ b/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp	2009-09-14 12:43:17 +0000
@@ -231,7 +231,7 @@ Uint32 FsOpenReq::getVersion(const Uint3
 inline
 void FsOpenReq::setVersion(Uint32 fileNumber[], Uint8 val){
   const Uint32 t = fileNumber[3];
-  fileNumber[3] = t & 0x00FFFFFF | (((Uint32)val) << 24);
+  fileNumber[3] = (t & 0x00FFFFFF) | (((Uint32)val) << 24);
 }
 
 inline 
@@ -242,7 +242,7 @@ Uint32 FsOpenReq::getSuffix(const Uint32
 inline
 void FsOpenReq::setSuffix(Uint32 fileNumber[], Uint8 val){
   const Uint32 t = fileNumber[3];
-  fileNumber[3] = t & 0xFF00FFFF | (((Uint32)val) << 16);
+  fileNumber[3] = (t & 0xFF00FFFF) | (((Uint32)val) << 16);
 }
 
 inline 
@@ -253,7 +253,7 @@ Uint32 FsOpenReq::v1_getDisk(const Uint3
 inline
 void FsOpenReq::v1_setDisk(Uint32 fileNumber[], Uint8 val){
   const Uint32 t = fileNumber[3];
-  fileNumber[3] = t & 0xFFFF00FF | (((Uint32)val) << 8);
+  fileNumber[3] = (t & 0xFFFF00FF) | (((Uint32)val) << 8);
 }
 
 inline 
@@ -294,7 +294,7 @@ Uint32 FsOpenReq::v1_getP(const Uint32 f
 inline
 void FsOpenReq::v1_setP(Uint32 fileNumber[], Uint8 val){
   const Uint32 t = fileNumber[3];
-  fileNumber[3] = t & 0xFFFFFF00 | val;
+  fileNumber[3] = (t & 0xFFFFFF00) | val;
 }
 
 /****************/

Attachment: [text/bzr-bundle] bzr/[e-mail]