[release-21.0] bugfix: Plan group by only on top of derived tables correctly (#18505)#18510

dbussink merged 2 commits intorelease-21.0vitessio/vitess:release-21.0from

backport-18505-to-release-21.0vitessio/vitess:backport-18505-to-release-21.0Copy head branch name to clipboard