Merge #60819

60819: sql: fix error message for virtual schema creation r=rafiss a=RichardJCai Previously, if mutDesc returned from NewTableDesc was nil, the error message would not correctly be shown because of a nil pointer exception. Release note: None Co-authored-by: richardjcai <[email protected]>
cockroachdb · Feb 20, 2021 · ea784c3 · ea784c3
2 parents 3851e17 + 65ec29e
commit ea784c3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/sql/virtual_schema.go b/pkg/sql/virtual_schema.go
@@ -176,7 +176,7 @@ func (t virtualSchemaTable) initVirtualTableDesc(
 		tree.PersistencePermanent,
 	)
 	if err != nil {
-		return mutDesc.TableDescriptor, err
+		return descpb.TableDescriptor{}, err
 	}
 	for _, index := range mutDesc.PublicNonPrimaryIndexes() {
 		if index.NumColumns() > 1 {