No need to do index checking if the table is not InnoDB
Merge branch 'QA_4_0'