Merge pull request #93435 from rafiss/fix-drop-role-system-priv

cockroachdb · Dec 13, 2022 · ccce779 · ccce779
2 parents 9a14474 + 8681d24
commit ccce779
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/sql/drop_role.go b/pkg/sql/drop_role.go
@@ -16,6 +16,7 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/security/username"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
@@ -586,6 +587,9 @@ func addDependentPrivilegesFromSystemPrivileges(
 	privilegeObjectFormatter *tree.FmtCtx,
 	userNamesToDependentPrivileges map[username.SQLUsername][]objectAndType,
 ) (retErr error) {
+	if !p.ExecCfg().Settings.Version.IsActive(ctx, clusterversion.SystemPrivilegesTable) {
+		return nil
+	}
 	names := make([]string, len(usernames))
 	for i, username := range usernames {
 		names[i] = username.Normalized()