Commit 607f7a6e authored by mronstrom@mysql.com's avatar mronstrom@mysql.com

18 bits didn't fit into Uint16

parent f67262fd
...@@ -143,7 +143,7 @@ private: ...@@ -143,7 +143,7 @@ private:
*/ */
static Uint8 getTakeOverScanFlag(const UintR & scanInfo); static Uint8 getTakeOverScanFlag(const UintR & scanInfo);
static Uint16 getTakeOverScanNode(const UintR & scanInfo); static Uint16 getTakeOverScanNode(const UintR & scanInfo);
static Uint16 getTakeOverScanInfo(const UintR & scanInfo); static Uint32 getTakeOverScanInfo(const UintR & scanInfo);
/** /**
...@@ -172,7 +172,7 @@ private: ...@@ -172,7 +172,7 @@ private:
*/ */
static void setTakeOverScanFlag(UintR & scanInfo, Uint8 flag); static void setTakeOverScanFlag(UintR & scanInfo, Uint8 flag);
static void setTakeOverScanNode(UintR & scanInfo, Uint16 node); static void setTakeOverScanNode(UintR & scanInfo, Uint16 node);
static void setTakeOverScanInfo(UintR & scanInfo, Uint16 aScanInfo); static void setTakeOverScanInfo(UintR & scanInfo, Uint32 aScanInfo);
}; };
/** /**
...@@ -490,9 +490,9 @@ TcKeyReq::getTakeOverScanNode(const UintR & scanInfo){ ...@@ -490,9 +490,9 @@ TcKeyReq::getTakeOverScanNode(const UintR & scanInfo){
} }
inline inline
Uint16 Uint32
TcKeyReq::getTakeOverScanInfo(const UintR & scanInfo){ TcKeyReq::getTakeOverScanInfo(const UintR & scanInfo){
return (Uint16)((scanInfo >> SCAN_INFO_SHIFT) & SCAN_INFO_MASK); return (Uint32)((scanInfo >> SCAN_INFO_SHIFT) & SCAN_INFO_MASK);
} }
...@@ -512,7 +512,7 @@ TcKeyReq::setTakeOverScanNode(UintR & scanInfo, Uint16 node){ ...@@ -512,7 +512,7 @@ TcKeyReq::setTakeOverScanNode(UintR & scanInfo, Uint16 node){
inline inline
void void
TcKeyReq::setTakeOverScanInfo(UintR & scanInfo, Uint16 aScanInfo){ TcKeyReq::setTakeOverScanInfo(UintR & scanInfo, Uint32 aScanInfo){
// ASSERT_MAX(aScanInfo, SCAN_INFO_MASK, "TcKeyReq::setTakeOverScanInfo"); // ASSERT_MAX(aScanInfo, SCAN_INFO_MASK, "TcKeyReq::setTakeOverScanInfo");
scanInfo |= (aScanInfo << SCAN_INFO_SHIFT); scanInfo |= (aScanInfo << SCAN_INFO_SHIFT);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment