Merge from mysql-5.5-innodb to local.

60fd9a18 · Marko Mäkelä · 789425e0 · 691bf28a · 60fd9a18
Commit 60fd9a18 authored Dec 02, 2010 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

storage/innobase/include/ut0ut.h storage/innobase/include/ut0ut.h +2 -0

No files found.
--- a/storage/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
@@ -61,6 +61,8 @@ typedef time_t	ib_time_t;
   Also asm volatile may trigger a memory barrier (spilling all registers
   to memory). */
 #  define UT_RELAX_CPU() __asm__ __volatile__ ("pause")
+#elif defined(HAVE_FAKE_PAUSE_INSTRUCTION)
+#  define UT_RELAX_CPU() __asm__ __volatile__ ("rep; nop")
 #elif defined(HAVE_ATOMIC_BUILTINS)
 #  define UT_RELAX_CPU() do { \
     volatile lint	volatile_var; \