This is an automated cherry-pick of pingcap#54665

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Jul 26, 2024 · 244beb6 · 244beb6
1 parent 42b624c
commit 244beb6
Show file tree

Hide file tree

Showing 7 changed files with 489 additions and 1 deletion.
diff --git a/pkg/ddl/schema.go b/pkg/ddl/schema.go
@@ -322,10 +322,13 @@ func (w *worker) onRecoverSchema(d *ddlCtx, t *meta.Meta, job *model.Job) (ver i
 			}
 		}
 		schemaInfo.State = model.StatePublic
+<<<<<<< HEAD
 		for _, recoverInfo := range recoverSchemaInfo.RecoverTabsInfo {
 			recoverInfo.TableInfo.State = model.StatePublic
 			recoverInfo.TableInfo.UpdateTS = t.StartTS
 		}
+=======
+>>>>>>> 320d0f41db7 (*: don't save table IDs in schema diff of FLASHBACK DATABASE (#54665))
 		// use to update InfoSchema
 		job.SchemaID = schemaInfo.ID
 		ver, err = updateSchemaVersion(d, t, job)