From: kevin.lewis Date: April 6 2012 4:36pm Subject: bzr push into mysql-trunk-wl5522 branch (kevin.lewis:3860 to 3861) List-Archive: http://lists.mysql.com/commits/143417 Message-Id: <20120406163612.57A121FA8E40@dhcp-adc-twvpn-2-vpnpool-10-154-44-40.vpn.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3861 kevin.lewis@stripped 2012-04-06 A second line in mysql_plugin.result needs to reflect the VERSION modified: mysql-test/r/mysql_plugin.result 3860 kevin.lewis@stripped 2012-04-06 Adjust an exit label to prevent an extremely unlikely memory leak on an error in CREATE TABLE. modified: storage/innobase/handler/ha_innodb.cc === modified file 'mysql-test/r/mysql_plugin.result' --- a/mysql-test/r/mysql_plugin.result revid:kevin.lewis@stripped +++ b/mysql-test/r/mysql_plugin.result revid:kevin.lewis@stripped @@ -129,4 +129,4 @@ Options: -V, --version Output version information and exit. -mysql_plugin Ver V.V.VV Distrib XX.XX.XX +mysql_plugin Ver V.V.VV Distrib XX.XX.XX-labs-april-2012 No bundle (reason: useless for push emails).