diff --git a/pkg/sql/conn_executor_test.go b/pkg/sql/conn_executor_test.go index 04000a229ba4..3e1e83deb2c9 100644 --- a/pkg/sql/conn_executor_test.go +++ b/pkg/sql/conn_executor_test.go @@ -1408,8 +1408,15 @@ func TestShowLastQueryStatistics(t *testing.T) { skip.UnderRace(t, "measure planning latency which is slower than usual under race") ctx := context.Background() - params := base.TestServerArgs{} - s, sqlConn, _ := serverutils.StartServer(t, params) + var testTenant base.DefaultTestTenantOptions + if syncutil.DeadlockEnabled { + // Under deadlock, the planning latency in the external process mode can + // sometimes exceed 1s allowed limit. + testTenant = base.TestSkipForExternalProcessMode() + } + s, sqlConn, _ := serverutils.StartServer(t, base.TestServerArgs{ + DefaultTestTenant: testTenant, + }) defer s.Stopper().Stop(ctx) testCases := []struct {