bug #4102 ALTER TABLE ORDER BY and InnoDB
Merge branch 'QA_4_0'