summaryrefslogtreecommitdiff
path: root/storage/innobase/sync
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2011-10-05 12:07:38 +0300
committerMarko Mäkelä <marko.makela@oracle.com>2011-10-05 12:07:38 +0300
commit99b36fe613a451cad993098e84f9f1040e868e28 (patch)
treea7d405f997d1fe9328bbda7667d1e2c68c0e3960 /storage/innobase/sync
parent14572938232ffcd0c34a64303a6fd5d5ede1f8a9 (diff)
parent16c919527fbedf373d7cbc34415b87cacea18993 (diff)
downloadmariadb-git-99b36fe613a451cad993098e84f9f1040e868e28.tar.gz
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage/innobase/sync')
-rw-r--r--storage/innobase/sync/sync0rw.c3
1 files changed, 3 insertions, 0 deletions
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;