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 | 99b36fe613a451cad993098e84f9f1040e868e28 (patch) | |
| tree | a7d405f997d1fe9328bbda7667d1e2c68c0e3960 /storage/innobase/include/sync0rw.ic | |
| parent | 14572938232ffcd0c34a64303a6fd5d5ede1f8a9 (diff) | |
| parent | 16c919527fbedf373d7cbc34415b87cacea18993 (diff) | |
| download | mariadb-git-99b36fe613a451cad993098e84f9f1040e868e28.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/include/sync0rw.ic')
| -rw-r--r-- | storage/innobase/include/sync0rw.ic | 1 |
1 files changed, 1 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. */ |