List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:December 2 2010 8:44am
Subject:bzr commit into mysql-trunk-innodb branch (vasil.dimov:3353)
View as plain text  
#At file:///usr/local/devel/bzrroot/server/mysql-trunk-innodb/ based on revid:sunny.bains@stripped

 3353 Vasil Dimov	2010-12-02 [merge]
      Merge mysql-5.5-innodb -> mysql-trunk-innodb

    modified:
      storage/innobase/include/ut0ut.h
=== modified file 'storage/innobase/include/ut0ut.h'
--- a/storage/innobase/include/ut0ut.h	revid:sunny.bains@stripped
+++ b/storage/innobase/include/ut0ut.h	revid:vasil.dimov@stripped
@@ -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; \

No bundle (reason: revision is a merge).
Thread
bzr commit into mysql-trunk-innodb branch (vasil.dimov:3353) vasil.dimov2 Dec