Skip to content

M
mariadb
Commit 7529870c authored by Alexander Barkov's avatar Alexander Barkov
Browse files
Options

Merge branch '10.0' of github.com:MariaDB/server into 10.0

parents 6d7362ee f31a8919
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/innobase/include/os0sync.h
View file @ 7529870c
...@@ -487,7 +487,7 @@ os_atomic_clear(volatile lock_word_t* ptr) ...@@ -487,7 +487,7 @@ os_atomic_clear(volatile lock_word_t* ptr)
__atomic_clear(ptr, __ATOMIC_RELEASE); __atomic_clear(ptr, __ATOMIC_RELEASE);
} }
# elif defined(IB_STRONG_MEMORY_MODEL) # elif defined(HAVE_ATOMIC_BUILTINS)
/** Do an atomic test and set. /** Do an atomic test and set.
@param[in,out] ptr Memory location to set to non-zero @param[in,out] ptr Memory location to set to non-zero
......
storage/xtradb/include/os0sync.h
View file @ 7529870c
...@@ -488,7 +488,7 @@ os_atomic_clear(volatile lock_word_t* ptr) ...@@ -488,7 +488,7 @@ os_atomic_clear(volatile lock_word_t* ptr)
__atomic_clear(ptr, __ATOMIC_RELEASE); __atomic_clear(ptr, __ATOMIC_RELEASE);
} }
# elif defined(IB_STRONG_MEMORY_MODEL) # elif defined(HAVE_ATOMIC_BUILTINS)
/** Do an atomic test and set. /** Do an atomic test and set.
@param[in,out] ptr Memory location to set to non-zero @param[in,out] ptr Memory location to set to non-zero
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7