Merge pull request #154886 from aerfrei/blathers/backport-release-25.4-154863

aerfrei · web-flow · commit 89cb8115bc11 · 2025-10-06T18:10:37.000-04:00
release-25.4: changefeedccl: prevent panic in per-table PTS mixed-version
diff --git a/pkg/ccl/changefeedccl/changefeed_processors.go b/pkg/ccl/changefeedccl/changefeed_processors.go
@@ -1974,7 +1974,7 @@ func (cf *changeFrontier) manageProtectedTimestamps(
 		return cf.frontier.Frontier()
 	}()
 
-	if cf.spec.ProgressConfig.PerTableProtectedTimestamps {
+	if cf.spec.ProgressConfig != nil && cf.spec.ProgressConfig.PerTableProtectedTimestamps {
 		return cf.managePerTableProtectedTimestamps(ctx, txn, &ptsEntries, highwater)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1974,7 +1974,7 @@ func (cf *changeFrontier) manageProtectedTimestamps(`
`1974`	`1974`	`return cf.frontier.Frontier()`
`1975`	`1975`	`}()`
`1976`	`1976`
`1977`		`- if cf.spec.ProgressConfig.PerTableProtectedTimestamps {`
	`1977`	`+ if cf.spec.ProgressConfig != nil && cf.spec.ProgressConfig.PerTableProtectedTimestamps {`
`1978`	`1978`	`return cf.managePerTableProtectedTimestamps(ctx, txn, &ptsEntries, highwater)`
`1979`	`1979`	`}`
`1980`	`1980`