False positive for incompatible schema change on non-ff merge when indexes on overlapping columns exist

[zachmu]

This happens on any non-fast-forward merge when there is more than one index defined on the same column. Repro here:

#8821

MySQL considers UNIQUE constraints distinct from indexes and allows you to create an index and a unique key on the same column, so we have to support this kind of schema.