Merge #69624

69624: builtins: block gateway_region from DistSQL r=arulajmani a=otan Resolves: #69598 Release justification: safety change Release note: None Co-authored-by: Oliver Tan <[email protected]>
cockroachdb · Aug 31, 2021 · b0379ad · b0379ad
2 parents c4778c7 + d7100c5
commit b0379ad
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/pkg/sql/sem/builtins/builtins.go b/pkg/sql/sem/builtins/builtins.go
@@ -5751,7 +5751,11 @@ value if you rely on the HLC for accuracy.`,
 	),
 
 	GatewayRegionBuiltinName: makeBuiltin(
-		tree.FunctionProperties{Category: categoryMultiRegion},
+		tree.FunctionProperties{
+			Category: categoryMultiRegion,
+			// We should always evaluate this built-in at the gateway.
+			DistsqlBlocklist: true,
+		},
 		tree.Overload{
 			Types:      tree.ArgTypes{},
 			ReturnType: tree.FixedReturnType(types.String),