Ref T10560. I don't fully understand what MySQL is doing here, but it looks like this key improves the problematic dataset in practice.

(It makes sense that this key helps, I'm just not sure why the two separate keys and the UNION ALL are so bad.)

This key isn't hugely expensive to add, so we can try it and see if there are still issues.

Ran bin/storage adjust, saw key added to table. Used SHOW CREATE TABLE ... to verify the key exists. Used EXPLAIN SELECT ... to make sure MySQL actually uses it.