This is an automated cherry-pick of #52888

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
pingcap · Apr 25, 2024 · 13cdb7d · 13cdb7d
1 parent e406d57
commit 13cdb7d
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/br/pkg/lightning/errormanager/errormanager.go b/br/pkg/lightning/errormanager/errormanager.go
@@ -157,6 +157,14 @@ const (
 		ORDER BY raw_key;
 	`
 
+<<<<<<< HEAD:br/pkg/lightning/errormanager/errormanager.go
+=======
+	deleteNullDataRow = `
+		DELETE FROM %s.` + ConflictErrorTableName + `
+		WHERE key_data = '' and row_data = '';
+	`
+
+>>>>>>> 54ba0ed6840 (lightning: fix delete additionally inserted rows for conflict detection 'replace' mode failed (#52888)):pkg/lightning/errormanager/errormanager.go
 	insertIntoDupRecord = `
 		INSERT INTO %s.` + DupRecordTable + `
 		(task_id, table_name, path, offset, error, row_id, row_data)