release-8.5: backport #66290 | tidb-test=release-8.5-20251125-v8.5.4#68590

ti-chi-bot[bot] merged 5 commits into

pingcap:release-8.5-20251125-v8.5.4pingcap/tidb:release-8.5-20251125-v8.5.4from

yibin87:cherry-pick-pr-66290-to-release-8.5-20251125-v8.5.4yibin87/tidb:cherry-pick-pr-66290-to-release-8.5-20251125-v8.5.4Copy head branch name to clipboard