From 59580868279a43db04dc44b9084f1afc3b199a58 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Thu, 9 Nov 2023 22:01:53 +0100 Subject: [PATCH] Fix auto-merge-conflict resolution problem Signed-off-by: Tim Vaillancourt --- go/vt/vtgate/planbuilder/abstract/queryprojection.go | 1 - 1 file changed, 1 deletion(-) diff --git a/go/vt/vtgate/planbuilder/abstract/queryprojection.go b/go/vt/vtgate/planbuilder/abstract/queryprojection.go index d8c7bac8169..51c074ff239 100644 --- a/go/vt/vtgate/planbuilder/abstract/queryprojection.go +++ b/go/vt/vtgate/planbuilder/abstract/queryprojection.go @@ -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 {