Merge pull request #150938 from cockroachdb/blathers/backport-release-25.3-150864

release-25.3: backup: deflake TestScheduleChainingWithDatabaseExpansion

Author: msbutler

pkg/backup/schedule_pts_chaining_test.go

@@ -422,8 +422,13 @@ INSERT INTO t select x, y from generate_series(1, 100) as g(x), generate_series(
 `)
 
 	backupAsOfTimes := make([]time.Time, 0)
-	th.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, _ time.Time) {
+	th.cfg.TestingKnobs.(*jobs.TestingKnobs).OverrideAsOfClause = func(clause *tree.AsOfClause, statementTime time.Time) {
 		backupAsOfTime := th.cfg.DB.KV().Clock().PhysicalTime()
+		if backupAsOfTime.After(statementTime) {
+			// If the backupAsOfTime is after the statement time, then we use the
+			// statement time.
+			backupAsOfTime = statementTime
+		}
 		expr, err := tree.MakeDTimestampTZ(backupAsOfTime, time.Microsecond)
 		require.NoError(t, err)
 		clause.Expr = expr