--- mysql-5.6.2-m5/include/my_global.h~	2011-03-14 09:40:38.000000000 -0400
+++ mysql-5.6.2-m5/include/my_global.h	2011-04-18 17:18:39.000000000 -0400
@@ -795,8 +795,10 @@
 #endif /* isfinite */
 
 #ifndef HAVE_ISNAN
+#ifndef isnan
 #define isnan(x) ((x) != (x))
 #endif
+#endif
 
 #ifdef HAVE_ISINF
 /* Check if C compiler is affected by GCC bug #39228 */
@@ -1049,8 +1051,8 @@
   (low byte first)
 */
 
-/* Optimized store functions for Intel x86 */
-#if defined(__i386__) || defined(_WIN32)
+/* Optimized store functions for Little-Endian Intel x86 */
+#if (!defined(WORDS_BIGENDIAN) && (defined(__i386__) || defined(_WIN32)))
 #define sint2korr(A)	(*((int16 *) (A)))
 #define sint3korr(A)	((int32) ((((uchar) (A)[2]) & 128) ? \
 				  (((uint32) 255L << 24) | \
@@ -1128,7 +1130,7 @@
 #else
 
 /*
-  We're here if it's not a IA-32 architecture (Win32 and UNIX IA-32 defines
+  We're here if it's not a Little-Endian IA-32 architecture (Win32 and UNIX IA-32 defines
   were done before)
 */
 #define sint2korr(A)	(int16) (((int16) ((uchar) (A)[0])) +\