Bad result in 5.1/5.5, strange error in 5.6
=> disable ROLLUP+DISTINCT, with meaningful error.
DISTINCT is often useless with GROUP BY anyway.
Of the modified testcases, most are for internally-reported bugs.
ROLLUP+ORDER is already disabled.