Merge Revision revid:jimmy.yang@oracle.com-20100728102044-1l801vzl3ki14mf8 from MySQL InnoDB
Original revid:jimmy.yang@oracle.com-20100728102044-1l801vzl3ki14mf8
Original Authors: Jimmy Yang <jimmy.yang@oracle.com> Original commit message: Fix bug #55581 by backporting fix of #52546 from mysql-trunk-innodb to mysql-5.1-innodb plugin.