Commit fc9dd732 authored by Sergey Glukhov's avatar Sergey Glukhov

automerge

parents d0762ef5 622246ec
...@@ -406,6 +406,7 @@ rw_lock_s_lock_func( ...@@ -406,6 +406,7 @@ rw_lock_s_lock_func(
#ifdef UNIV_SYNC_DEBUG #ifdef UNIV_SYNC_DEBUG
ut_ad(!rw_lock_own(lock, RW_LOCK_SHARED)); /* see NOTE above */ ut_ad(!rw_lock_own(lock, RW_LOCK_SHARED)); /* see NOTE above */
ut_ad(!rw_lock_own(lock, RW_LOCK_EX));
#endif /* UNIV_SYNC_DEBUG */ #endif /* UNIV_SYNC_DEBUG */
/* TODO: study performance of UNIV_LIKELY branch prediction hints. */ /* TODO: study performance of UNIV_LIKELY branch prediction hints. */
......
...@@ -626,6 +626,9 @@ rw_lock_x_lock_func( ...@@ -626,6 +626,9 @@ rw_lock_x_lock_func(
ibool spinning = FALSE; ibool spinning = FALSE;
ut_ad(rw_lock_validate(lock)); ut_ad(rw_lock_validate(lock));
#ifdef UNIV_SYNC_DEBUG
ut_ad(!rw_lock_own(lock, RW_LOCK_SHARED));
#endif /* UNIV_SYNC_DEBUG */
i = 0; i = 0;
......
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