Skip to content

Commit

Permalink
Fix auto-merge-conflict resolution problem
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Vaillancourt <[email protected]>
  • Loading branch information
timvaillancourt committed Nov 9, 2023
1 parent 66b8b39 commit 5958086
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion go/vt/vtgate/planbuilder/abstract/queryprojection.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ func CreateQPFromSelect(sel *sqlparser.Select) (*QueryProjection, error) {
}
for _, group := range sel.GroupBy {
selectExprIdx, aliasExpr := qp.FindSelectExprIndexForExpr(group)
selectExprIdx, aliasExpr := qp.FindSelectExprIndexForExpr(ctx, group)
weightStrExpr := qp.GetSimplifiedExpr(group)
err = checkForInvalidGroupingExpressions(weightStrExpr)
if err != nil {
Expand Down

0 comments on commit 5958086

Please sign in to comment.