Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6871 from MySQL InnoDB
Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6871
Original Authors: vdimov
Original commit message:
branches/zip:
Whitespace fixup to be consistent with the rest of the file.