diff --git a/pkg/internal/sqlsmith/schema.go b/pkg/internal/sqlsmith/schema.go index ebe58b91e8e2..46880a5c261e 100644 --- a/pkg/internal/sqlsmith/schema.go +++ b/pkg/internal/sqlsmith/schema.go @@ -481,7 +481,8 @@ var functions = func() map[tree.FunctionClass]map[oid.Oid][]function { continue } if strings.Contains(def.Name, "crdb_internal.force_") || - strings.Contains(def.Name, "crdb_internal.unsafe_") { + strings.Contains(def.Name, "crdb_internal.unsafe_") || + strings.Contains(def.Name, "crdb_internal.create_join_token") { continue } if _, ok := m[def.Class]; !ok { diff --git a/pkg/server/stats_test.go b/pkg/server/stats_test.go index 71e00b4a20ce..836efaae972d 100644 --- a/pkg/server/stats_test.go +++ b/pkg/server/stats_test.go @@ -27,6 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/tests" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" + "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" @@ -37,6 +38,12 @@ import ( func TestTelemetrySQLStatsIndependence(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + + // This test fails if the central reporting server from CRL + // breaks. It should be improved to customize the reporting URL and + // mock the registration collector with an in-memory server. + skip.WithIssue(t, 63851) + ctx := context.Background() params, _ := tests.CreateTestServerParams() s, sqlDB, _ := serverutils.StartServer(t, params)