bzr push into mysql-trunk branch (marko.makela:3477 to 3478)

[marko.makela]

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

    modified:
      storage/innobase/include/sync0rw.ic
      storage/innobase/sync/sync0rw.c
 3477 Rohit Kalhans	2011-10-05
      Bug#12664445: Added test cases for the variables:
      
      -INNODB_ANALYZE_IS_PERSISTENT
      -INNODB_MONITOR_DISABLE
      -INNODB_MONITOR_ENABLE
      -INNODB_MONITOR_RESET
      -INNODB_MONITOR_RESET_ALL
      -INNODB_PRINT_ALL_DEADLOCKS
      -INNODB_STATS_PERSISTENT_SAMPLE_PAGES
      -INNODB_STATS_TRANSIENT_SAMPLE_PAGES
      -INNODB_SYNC_ARRAY_SIZE
      
      Now the sys_vars.all_vars result file does not have any variables listed in it.

    added:
      mysql-test/suite/sys_vars/r/innodb_analyze_is_persistent_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
      mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
      mysql-test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result
      mysql-test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result
      mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result
      mysql-test/suite/sys_vars/r/innodb_sync_array_size_basic.result
      mysql-test/suite/sys_vars/t/innodb_analyze_is_persistent_basic.test
      mysql-test/suite/sys_vars/t/innodb_monitor_disable_basic.test
      mysql-test/suite/sys_vars/t/innodb_monitor_enable_basic.test
      mysql-test/suite/sys_vars/t/innodb_monitor_reset_all_basic.test
      mysql-test/suite/sys_vars/t/innodb_monitor_reset_basic.test
      mysql-test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test
      mysql-test/suite/sys_vars/t/innodb_stats_persistent_sample_pages_basic.test
      mysql-test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test
      mysql-test/suite/sys_vars/t/innodb_sync_array_size_basic.test
    modified:
      mysql-test/suite/sys_vars/r/all_vars.result
=== modified file 'storage/innobase/include/sync0rw.ic'
--- a/storage/innobase/include/sync0rw.ic	revid:sneha.modi@stripped
+++ b/storage/innobase/include/sync0rw.ic	revid:[e-mail]-20111005091410-89jnv7ssh4aqe6hm
@@ -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:sneha.modi@stripped09yv1b6zi6
+++ b/storage/innobase/sync/sync0rw.c	revid:marko.makela@stripped
@@ -631,6 +631,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).