From 510835a0727fc1ebe98e2808cae91c8ab014d27e Mon Sep 17 00:00:00 2001
From: Mikael Ronstrom <mikael@mysql.com>
Date: Wed, 10 Jun 2009 12:23:02 +0200
Subject: [PATCH] Fix for BUG#45131

---
 include/atomic/x86-gcc.h        |  2 +-
 storage/innobase/include/univ.i | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/include/atomic/x86-gcc.h b/include/atomic/x86-gcc.h
index d79dadbf05e..726c98213fb 100644
--- a/include/atomic/x86-gcc.h
+++ b/include/atomic/x86-gcc.h
@@ -35,7 +35,7 @@
   asm volatile (LOCK "; xadd %0, %1;" : "+r" (v) , "+m" (*a))
 #endif
 #define make_atomic_swap_body(S)				\
-  asm volatile ("; xchg %0, %1;" : "+r" (v) , "+m" (*a))
+  asm volatile ("; xchg %0, %1;" : "+q" (v) , "+m" (*a))
 #define make_atomic_cas_body(S)					\
   asm volatile (LOCK "; cmpxchg %3, %0; setz %2;"		\
                : "+m" (*a), "+a" (*cmp), "=q" (ret): "r" (set))
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
index d1d5439349f..bb44a91a343 100644
--- a/storage/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
@@ -67,20 +67,6 @@ of the 32-bit x86 assembler in mutex operations. */
 #  define UNIV_MUST_NOT_INLINE
 # endif
 
-/* When on Solaris, gcc, and 32-bit disable inlining */
-
-# if defined(__GNUC__) && defined(UNIV_SOLARIS) && defined(__i386__)
-#  undef  UNIV_MUST_NOT_INLINE
-#  define UNIV_MUST_NOT_INLINE
-# endif
-
-/* When on Mac OS X, gcc, and 32-bit x86 disable inlining */
-
-# if defined(__GNUC__) && defined(__APPLE__) && defined (__MACH__) && defined(__i386__)
-#  undef  UNIV_MUST_NOT_INLINE
-#  define UNIV_MUST_NOT_INLINE
-# endif
-
 # ifdef HAVE_PREAD
 #  define HAVE_PWRITE
 # endif