From: Mattias Jonsson Date: August 13 2012 10:27am Subject: bzr push into mysql-trunk branch (mattias.jonsson:4221 to 4222) List-Archive: http://lists.mysql.com/commits/144557 Message-Id: <20120813102749.10448.4875.4222@MJONSSON-LAP.se.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4222 Mattias Jonsson 2012-08-13 [merge] merge 4221 Inaam Rana 2012-08-13 [merge] merge from 5.6 modified: mysql-test/suite/sys_vars/r/innodb_io_capacity_basic.result mysql-test/suite/sys_vars/r/innodb_max_io_capacity_basic.result storage/innobase/handler/ha_innodb.cc storage/innobase/include/srv0srv.h No bundle (reason: useless for push emails).