diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-10-05 12:07:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-10-05 12:07:38 +0300 |
| commit | 622246ec7400fac8c3c0b9604789be357fa0f4fc (patch) | |
| tree | a7d405f997d1fe9328bbda7667d1e2c68c0e3960 /storage/innobase | |
| parent | 32d770fba383cd923d4179616efd3e6562724a10 (diff) | |
| parent | 739c52967280d93321af4780cc628f6a839444c4 (diff) | |
| download | mariadb-git-622246ec7400fac8c3c0b9604789be357fa0f4fc.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/include/sync0rw.ic | 1 | ||||
| -rw-r--r-- | storage/innobase/sync/sync0rw.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic index 2ffd9fdafb5..51cf7121b4c 100644 --- a/storage/innobase/include/sync0rw.ic +++ b/storage/innobase/include/sync0rw.ic @@ -406,6 +406,7 @@ rw_lock_s_lock_func( #ifdef UNIV_SYNC_DEBUG 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 */ /* TODO: study performance of UNIV_LIKELY branch prediction hints. */ diff --git a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c index 0f0df71316e..fc4f987fe65 100644 --- a/storage/innobase/sync/sync0rw.c +++ b/storage/innobase/sync/sync0rw.c @@ -626,6 +626,9 @@ rw_lock_x_lock_func( ibool spinning = FALSE; 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; |