database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Alexander Barkov
2015-12-29 15:19:29 +04:00
parent 6d7362eeb8 f31a89191f
commit 7529870c7e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/include/os0sync.h
View File

@@ -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

2
storage/xtradb/include/os0sync.h
View File

@@ -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