Merge mysql-5.1-security -> mysql-5.5-security up to

sunny.bains@oracle.com-20100805092434-tvxxzjgqgslo14en

This is a null merge of InnoDB changes which will be ported into a
separate commits.