diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-24 18:48:58 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-24 18:48:58 +0200 |
| commit | 69204571425ed3221e94c7eb1e030c00089bca26 (patch) | |
| tree | 3d9cfbc44a057883c7db6bce267c8ebfd5fa9313 /storage/xtradb/include/sync0rw.ic | |
| parent | e3e60a4102d6918e4231e402bef89b1a6b2a20cb (diff) | |
| parent | d26aefb0775048128495eaab151ee4118f8f7afd (diff) | |
| download | mariadb-git-69204571425ed3221e94c7eb1e030c00089bca26.tar.gz | |
Merge with MariaDB 5.1
Diffstat (limited to 'storage/xtradb/include/sync0rw.ic')
| -rw-r--r-- | storage/xtradb/include/sync0rw.ic | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/xtradb/include/sync0rw.ic b/storage/xtradb/include/sync0rw.ic index 7116f1b7c9b..485a63a1b18 100644 --- a/storage/xtradb/include/sync0rw.ic +++ b/storage/xtradb/include/sync0rw.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved. +Copyright (c) 1995, 2011, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -603,16 +603,16 @@ rw_lock_x_unlock_direct( ut_ad((lock->lock_word % X_LOCK_DECR) == 0); -#ifdef UNIV_SYNC_DEBUG - rw_lock_remove_debug_info(lock, 0, RW_LOCK_EX); -#endif - if (lock->lock_word == 0) { lock->recursive = FALSE; UNIV_MEM_INVALID(&lock->writer_thread, sizeof lock->writer_thread); } +#ifdef UNIV_SYNC_DEBUG + rw_lock_remove_debug_info(lock, 0, RW_LOCK_EX); +#endif + lock->lock_word += X_LOCK_DECR; ut_ad(!lock->waiters); |