Merge Revision revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6800 from MySQL InnoDB
Original revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6800
Original Authors: marko
Original commit message:
branches/zip: Add ut_ad(mtr->state == MTR_ACTIVE) to various places.