[release-21.0] Fix subquery merging regression introduced in #11379 (#18260)#18262

systay merged 1 commit intorelease-21.0vitessio/vitess:release-21.0from

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