Merge Revision revid:vasil.dimov@oracle.com-20100525080103-1r5loasor392qiou from MySQL InnoDB
Original revid:vasil.dimov@oracle.com-20100525080103-1r5loasor392qiou
Original Authors: Vasil Dimov <vasil.dimov@oracle.com>
Original commit message:
Fix comments on row_merge_write()
This is a port of
vasil.dimov@oracle.com-20100521175337-c1b1lqxgizqegb0w and
vasil.dimov@oracle.com-20100521180951-mef23h24k023xuwq
from mysql-trunk-innodb