Skip to content

Commit 92f7a94

Browse files
committed
Merge branch 'zachmu/project-iters' of github.com:dolthub/go-mysql-server into zachmu/project-iters
2 parents 1276357 + 96bb36c commit 92f7a94

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

sql/core.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type Expression interface {
4545
WithChildren(children ...Expression) (Expression, error)
4646
}
4747

48-
// RowIterExpression is an Expression that returns a RowIter rather than a scalar, used to implement functions that
48+
// RowIterExpression is an Expression that returns a RowIter rather than a scalar, used to implement functions that
4949
// return sets.
5050
type RowIterExpression interface {
5151
Expression

sql/types/conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ func GeneralizeTypes(a, b sql.Type) sql.Type {
648648
if IsNullType(b) {
649649
return a
650650
}
651-
651+
652652
if svt, ok := a.(sql.SystemVariableType); ok {
653653
a = svt.UnderlyingType()
654654
}

0 commit comments

Comments
 (0)