Upmerge the 47337 fix from 5.1 to 5.5

This is a null-merge, there is nothing to change in 5.5 and up.
That bug is strictly specific to 5.1 and the InnoDB *plugin*.