Skip to content

Commit

Permalink
Merge pull request #130943 from cockroachdb/blathers/backport-release…
Browse files Browse the repository at this point in the history
…-24.2-130906

release-24.2: sql: deflake TestValidationWithProtectedTS
  • Loading branch information
rafiss authored Sep 18, 2024
2 parents 9f45317 + 1aebc60 commit b2c7163
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pkg/sql/backfill_protected_timestamp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ func TestValidationWithProtectedTS(t *testing.T) {
SQLEvalContext: &eval.TestingKnobs{
ForceProductionValues: true,
},
Store: &kvserver.StoreTestingKnobs{
DisableSplitQueue: true,
},
SQLExecutor: &sql.ExecutorTestingKnobs{
BeforeExecute: func(ctx context.Context, sql string, descriptors *descs.Collection) {
if indexScanQuery.MatchString(sql) {
Expand Down

0 comments on commit b2c7163

Please sign in to comment.