77 *
88 *
99 * IDENTIFICATION
10- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.7 1997/09/08 21:45:24 momjian Exp $
10+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.8 1997/09/25 12: 21:15 vadim Exp $
1111 *
1212 *-------------------------------------------------------------------------
1313 */
@@ -394,7 +394,6 @@ make_groupPlan(List **tlist,
394394Group * grpplan ;
395395int numCols ;
396396AttrNumber * grpColIdx ;
397- int keyno = 1 ;
398397int last_resno = 1 ;
399398
400399numCols = length (groupClause );
@@ -412,13 +411,15 @@ make_groupPlan(List **tlist,
412411 */
413412foreach (sl ,sort_tlist )
414413{
415- Resdom * resdom = NULL ;
416- TargetEntry * te = (TargetEntry * )lfirst (sl );
414+ Resdom * resdom = NULL ;
415+ TargetEntry * te = (TargetEntry * )lfirst (sl );
416+ int keyno = 0 ;
417417
418- foreach (gl ,glc )
418+ foreach (gl ,groupClause )
419419{
420420GroupClause * grpcl = (GroupClause * )lfirst (gl );
421421
422+ keyno ++ ;
422423if (grpcl -> entry -> resdom -> resno == te -> resdom -> resno )
423424{
424425
@@ -427,7 +428,6 @@ make_groupPlan(List **tlist,
427428resdom -> reskeyop = get_opcode (grpcl -> grpOpoid );
428429resdom -> resno = last_resno ;/* re-set */
429430grpColIdx [keyno - 1 ]= last_resno ++ ;
430- keyno ++ ;
431431glc = lremove (lfirst (gl ),glc );/* TLE found for it */
432432break ;
433433}