Code

fix conflict#2

Code

Merged

hehechen merged 1 commit intoti-chi-bot:cherry-pick-38571-to-release-6.1ti-chi-bot/tidb:cherry-pick-38571-to-release-6.1from hehechen:cherry-pick-38571-to-release-6.1hehechen/tidb:cherry-pick-38571-to-release-6.1Copy head branch name to clipboardJan 6, 2023

-115

Commits

Commits on Jan 6, 2023

• fix conflict

  Show description for 9872240
  

  hehechen

  committed
  9872240

  Copy full SHA for 9872240