diff options
| author | Mikael Ronstrom <mikael@mysql.com> | 2008-10-30 10:23:36 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@mysql.com> | 2008-10-30 10:23:36 +0100 |
| commit | 090bcb74ab25bc46fe312ab03f8cee5f46650383 (patch) | |
| tree | d977ebd9831d11d7eeda892e050f306b45bd78c5 /storage/innobase/include/sync0sync.h | |
| parent | e21ed0a83e5c4a24ee359ece4a04bbde44cbc2b2 (diff) | |
| download | mariadb-git-090bcb74ab25bc46fe312ab03f8cee5f46650383.tar.gz | |
Merge port of Google SMP patch to Solaris
Diffstat (limited to 'storage/innobase/include/sync0sync.h')
| -rw-r--r-- | storage/innobase/include/sync0sync.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h index cfc1c8d2c40..e311d75a189 100644 --- a/storage/innobase/include/sync0sync.h +++ b/storage/innobase/include/sync0sync.h @@ -16,6 +16,7 @@ Created 9/5/1995 Heikki Tuuri #include "os0thread.h" #include "os0sync.h" #include "sync0arr.h" +#include "my_atomic.h" #ifndef UNIV_HOTBACKUP extern my_bool timed_mutexes; @@ -476,7 +477,10 @@ struct mutex_struct { test-and-set instruction in Win32 and x86 32/64 with GCC 4.1.0 or later version */ #if defined(_WIN32) && defined(UNIV_CAN_USE_X86_ASSEMBLER) -#elif defined(HAVE_GCC_ATOMIC_BUILTINS) +#elif defined(MY_ATOMIC_NOLOCK) + /* We have my_atomic_* routines that are + intrinsically atomic, so no need for the + mutex. */ #else os_fast_mutex_t os_fast_mutex; /* In other systems we use this OS mutex |