Null merge mysql-5.1-bugteam -> mysql-5.5-bugteam

This is a null merge because it only contains InnoDB changes that
originated in mysql-5.1-innodb and have been manually ported into
mysql-5.5-innodb.