Backport of USE and DATABASE() fix#6158

morgo merged 1 commit intovitessio:release-6.0vitessio/vitess:release-6.0from

planetscale:use-fix-backportplanetscale/vitess:use-fix-backportCopy head branch name to clipboard