bzr push into mysql-trunk branch (marc.alff:3954 to 3955)

[Marc Alff]

 3955 Marc Alff	2012-06-06
      Improved the test robustness for performance_schema.sizing_growth

    modified:
      mysql-test/suite/perfschema/r/sizing_growth.result
      mysql-test/suite/perfschema/t/sizing_growth.test
      mysql-test/suite/perfschema/t/sizing_off.cnf
 3954 Hemant Kumar	2012-06-06
      Moving memcached tests out from experimental list, since they are not failing anymore.

    modified:
      mysql-test/collections/default.experimental
=== modified file 'mysql-test/suite/perfschema/r/sizing_growth.result'
--- a/mysql-test/suite/perfschema/r/sizing_growth.result	2012-05-25 13:22:34 +0000
+++ b/mysql-test/suite/perfschema/r/sizing_growth.result	2012-06-06 14:19:43 +0000
@@ -187,9 +187,9 @@ select @rwlock_per_share;
 select @cond_per_share;
 @cond_per_share
 0
-select @file_per_share;
-@file_per_share
-2
+select @file_per_share <= 2;
+@file_per_share <= 2
+1
 select @mutex_per_con;
 @mutex_per_con
 3
@@ -214,3 +214,21 @@ select @cond_per_handle;
 select @file_per_handle;
 @file_per_handle
 0
+select if(
+(@mutex_per_share = 3)
+AND (@rwlock_per_share = 1)
+AND (@cond_per_share = 0)
+AND (@file_per_share <= 2)
+AND (@mutex_per_con = 3)
+AND (@rwlock_per_con = 1)
+AND (@cond_per_con = 2)
+AND (@file_per_con = 0)
+AND (@mutex_per_handle = 0)
+AND (@rwlock_per_handle = 0)
+AND (@cond_per_handle = 0)
+AND (@file_per_handle = 0),
+"OK: heuristics are up to date",
+"FAILED: heuristics need to be updated")
+as status;
+status
+OK: heuristics are up to date

=== modified file 'mysql-test/suite/perfschema/t/sizing_growth.test'
--- a/mysql-test/suite/perfschema/t/sizing_growth.test	2012-05-25 13:22:34 +0000
+++ b/mysql-test/suite/perfschema/t/sizing_growth.test	2012-06-06 14:19:43 +0000
@@ -379,7 +379,12 @@ select @cond_per_share;
 # - wait/io/file/sql/FRM
 # more with innodb file per table
 #
-select @file_per_share;
+# This however is very storage engine dependent,
+# and platform dependent (not all platform instrument file io the same way,
+# or at all)
+# 
+#
+select @file_per_share <= 2;
 
 #
 # Expecting 3:
@@ -427,3 +432,28 @@ select @cond_per_handle;
 #
 select @file_per_handle;
 
+#
+# IMPORTANT NOTE:
+# when any measurement here changes, the heuristics
+# in storage/perfschema/pfs_autosize.cc need to be updated.
+# Note that this in turns imply to update the results for sizing_*,
+# which will lead to different estimations for automated sizing.
+#
+
+select if(
+      (@mutex_per_share = 3)
+  AND (@rwlock_per_share = 1)
+  AND (@cond_per_share = 0)
+  AND (@file_per_share <= 2)
+  AND (@mutex_per_con = 3)
+  AND (@rwlock_per_con = 1)
+  AND (@cond_per_con = 2)
+  AND (@file_per_con = 0)
+  AND (@mutex_per_handle = 0)
+  AND (@rwlock_per_handle = 0)
+  AND (@cond_per_handle = 0)
+  AND (@file_per_handle = 0),
+  "OK: heuristics are up to date",
+  "FAILED: heuristics need to be updated")
+  as status;
+

=== modified file 'mysql-test/suite/perfschema/t/sizing_off.cnf'
--- a/mysql-test/suite/perfschema/t/sizing_off.cnf	2012-05-31 13:12:15 +0000
+++ b/mysql-test/suite/perfschema/t/sizing_off.cnf	2012-06-06 14:19:43 +0000
@@ -11,7 +11,7 @@ open_files_limit=1024
 
 # Disable the performacne schema.
 # Sizing does not occur then
-skip-performance-schema
+loose-skip-performance-schema
 
 # Automated sizing for everything
 

No bundle (reason: useless for push emails).