bzr push into mysql-5.5 branch (marko.makela:3566 to 3567)

[marko.makela]

 3567 Marko Mäkelä	2011-10-05 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      storage/innobase/include/sync0rw.ic
      storage/innobase/sync/sync0rw.c
 3566 Marko Mäkelä	2011-10-04 [merge]
      Merge mysql-5.1 to mysql-5.5.

=== modified file 'storage/innobase/include/sync0rw.ic'
--- a/storage/innobase/include/sync0rw.ic	revid:marko.makela@strippedni6l01tq
+++ b/storage/innobase/include/sync0rw.ic	revid:marko.makela@stripped
@@ -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. */

=== modified file 'storage/innobase/sync/sync0rw.c'
--- a/storage/innobase/sync/sync0rw.c	revid:marko.makela@stripped0111004182045-8jxf4xnzni6l01tq
+++ b/storage/innobase/sync/sync0rw.c	revid:marko.makela@strippeddn4jhnpq6gfo25yf
@@ -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;
 

No bundle (reason: useless for push emails).