lightning: check hasDupe and tableID when resolve duplicate rows (#40696)#40792

Merged

ti-chi-bot merged 2 commits intopingcap:release-6.1from ti-chi-bot:cherry-pick-40696-to-release-6.1

Mar 30, 2023

Commits on Jan 28, 2023

This is an automated cherry-pick of pingcap#40696

sleepymole
authored and
ti-chi-bot
committed
resolve conflicts
sleepymole
committed