bzr push into mysql-trunk branch (marc.alff:4043 to 4044)

[Marc Alff]

 4044 Marc Alff	2012-07-12 [merge]
      Merge mysql-5.6 --> mysql-trunk

    modified:
      mysql-test/suite/perfschema/r/sizing_growth.result
      mysql-test/suite/perfschema/t/sizing_growth.test
 4043 Hery Ramilison	2012-07-12 [merge]
      Empty version change upmerge

=== modified file 'mysql-test/suite/perfschema/r/sizing_growth.result'
--- a/mysql-test/suite/perfschema/r/sizing_growth.result	2012-06-25 09:50:31 +0000
+++ b/mysql-test/suite/perfschema/r/sizing_growth.result	2012-07-12 15:16:30 +0000
@@ -203,9 +203,6 @@ Performance_schema_table_instances_lost	
 Performance_schema_thread_classes_lost	0
 Performance_schema_thread_instances_lost	0
 Performance_schema_users_lost	0
-select @mutex_per_share <= 5;
-@mutex_per_share <= 5
-1
 select @rwlock_per_share <= 3;
 @rwlock_per_share <= 3
 1
@@ -240,8 +237,7 @@ select @file_per_handle;
 @file_per_handle
 0
 select if(
-(@mutex_per_share <= 5)
-AND (@rwlock_per_share <= 3)
+(@rwlock_per_share <= 3)
 AND (@cond_per_share = 0)
 AND (@file_per_share <= 3)
 AND (@mutex_per_con = 3)

=== modified file 'mysql-test/suite/perfschema/t/sizing_growth.test'
--- a/mysql-test/suite/perfschema/t/sizing_growth.test	2012-06-25 09:50:31 +0000
+++ b/mysql-test/suite/perfschema/t/sizing_growth.test	2012-07-12 15:16:30 +0000
@@ -371,8 +371,15 @@ show status like "performance_schema%";
 # For innodb:
 # - wait/synch/mutex/innodb/autoinc_mutex
 # - wait/synch/mutex/innodb/os_mutex
+# Note that depending on the platform,
+# and the version of the compiler used,
+# code in the server may use either native platform atomics
+# or a mutex.
+# Note also that in DEBUG builds, code uses more mutexes.
+# Because of all these parameters,
+# this test is disabled, as predicting an exact number is difficult.
 # 
-select @mutex_per_share <= 5;
+# commented: select @mutex_per_share <= 5;
 
 #
 # Expecting 1:
@@ -449,9 +456,12 @@ select @file_per_handle;
 # sizing, and imply to update the results for sizing_*.
 #
 
+# commented: (@mutex_per_share <= 5)
+# Mutexes are not instrumented by default,
+# not enforcing mutex estimates
+
 select if(
-      (@mutex_per_share <= 5)
-  AND (@rwlock_per_share <= 3)
+      (@rwlock_per_share <= 3)
   AND (@cond_per_share = 0)
   AND (@file_per_share <= 3)
   AND (@mutex_per_con = 3)

No bundle (reason: useless for push emails).