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
commit622246ec7400fac8c3c0b9604789be357fa0f4fc (patch)
treea7d405f997d1fe9328bbda7667d1e2c68c0e3960 /storage/innobase/sync
parent32d770fba383cd923d4179616efd3e6562724a10 (diff)
parent739c52967280d93321af4780cc628f6a839444c4 (diff)
downloadmariadb-git-622246ec7400fac8c3c0b9604789be357fa0f4fc.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;