InnoDB 5.6.20

This commit is contained in:
Sergei Golubchik 2014-09-11 16:42:54 +02:00
commit 75796d9ecb
51 changed files with 1027 additions and 659 deletions

View file

@ -93,6 +93,7 @@ rw_lock_set_waiter_flag(
(void) os_compare_and_swap_ulint(&lock->waiters, 0, 1);
#else /* INNODB_RW_LOCKS_USE_ATOMICS */
lock->waiters = 1;
os_wmb;
#endif /* INNODB_RW_LOCKS_USE_ATOMICS */
}
@ -110,6 +111,7 @@ rw_lock_reset_waiter_flag(
(void) os_compare_and_swap_ulint(&lock->waiters, 1, 0);
#else /* INNODB_RW_LOCKS_USE_ATOMICS */
lock->waiters = 0;
os_wmb;
#endif /* INNODB_RW_LOCKS_USE_ATOMICS */
}
@ -200,13 +202,16 @@ rw_lock_lock_word_decr(
{
#ifdef INNODB_RW_LOCKS_USE_ATOMICS
lint local_lock_word;
os_rmb;
while ((local_lock_word= lock->lock_word) > 0) {
os_rmb;
local_lock_word = lock->lock_word;
while (local_lock_word > 0) {
if (os_compare_and_swap_lint(&lock->lock_word,
local_lock_word,
local_lock_word - amount)) {
return(TRUE);
}
local_lock_word = lock->lock_word;
}
return(FALSE);
#else /* INNODB_RW_LOCKS_USE_ATOMICS */