GROUP-BY IT OFTEN GIVES WRONG RESULTS

Post-push fix.

On trunk and 5.7: re-arranging statement to avoid problems
                  with "--query_cache_type=1".
On 5.6: additional issues with explain output.