Commit 61caf463 authored by unknown's avatar unknown

Bug #24992 Enabling Shared Memory support on Windows x64 causes client to fail

- Mistaken macro defintions cause mysys to read packets in the wrong order.


include/my_global.h:
  Bug #24992 Enabling Shared Memory support on Windows x64 causes client to fail
  - Use low byte order optimizations for Windows.
parent aeb3bd3c
...@@ -1053,7 +1053,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */ ...@@ -1053,7 +1053,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */
*/ */
/* Optimized store functions for Intel x86 */ /* Optimized store functions for Intel x86 */
#if defined(__i386__) || (defined(_WIN32) && !defined(_WIN64)) #if defined(__i386__) || defined(_WIN32)
#define sint2korr(A) (*((int16 *) (A))) #define sint2korr(A) (*((int16 *) (A)))
#define sint3korr(A) ((int32) ((((uchar) (A)[2]) & 128) ? \ #define sint3korr(A) ((int32) ((((uchar) (A)[2]) & 128) ? \
(((uint32) 255L << 24) | \ (((uint32) 255L << 24) | \
...@@ -1242,7 +1242,7 @@ do { doubleget_union _tmp; \ ...@@ -1242,7 +1242,7 @@ do { doubleget_union _tmp; \
#define float8store(V,M) doublestore((V),(M)) #define float8store(V,M) doublestore((V),(M))
#endif /* WORDS_BIGENDIAN */ #endif /* WORDS_BIGENDIAN */
#endif /* __i386__ OR _WIN32 AND !_WIN64 */ #endif /* __i386__ OR _WIN32 */
/* /*
Macro for reading 32-bit integer from network byte order (big-endian) Macro for reading 32-bit integer from network byte order (big-endian)
......
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