From: Bjorn Munch
Date: June 8 2012 2:33pm
Subject: bzr push into mysql-trunk branch (bjorn.munch:3978 to 3979)
List-Archive: http://lists.mysql.com/commits/144153
Message-Id: <20120608143350.19067.62978.3979@khepri15.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3979 Bjorn Munch	2012-06-08 [merge]
      null upmerge

 3978 Marc Alff	2012-06-08
      Improved the test performance_schema.sizing_growth robustness, again.
      Fixed files_per_share to 3

    modified:
      mysql-test/suite/perfschema/r/sizing_default.result
      mysql-test/suite/perfschema/r/sizing_growth.result
      mysql-test/suite/perfschema/r/sizing_high.result
      mysql-test/suite/perfschema/r/sizing_low.result
      mysql-test/suite/perfschema/r/sizing_med.result
      mysql-test/suite/perfschema/t/sizing_growth.test
      storage/perfschema/pfs_autosize.cc
No bundle (reason: useless for push emails).