Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6792 from MySQL InnoDB
Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6792
Original Authors: marko
Original commit message:
branches/zip: Copy tests from branches/5.1 that were lost in some merge.