opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix for psort. fixes regression tests.

This commit is contained in:
Bruce Momjian 1998-02-01 22:20:47 +00:00
parent a654db303e
commit 79f99a3888
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/parser/parse_expr.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.13 1998/02/01 19:43:37 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.14 1998/02/01 22:20:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -252,14 +252,14 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
lfirst(llist) = transformExpr(pstate, lfirst(llist), precedence);
if (length(sublink->lefthand) !=
length(sublink->subselect->targetList))
length(((Query *)sublink->subselect)->targetList))
elog(ERROR,"Subselect has too many or too few fields.");
if (sublink->subLinkType != EXISTS_SUBLINK)
{
char *op = lfirst(sublink->oper);
List *left_expr = sublink->lefthand;
List *right_expr = sublink->subselect->targetList;
List *right_expr = ((Query *)sublink->subselect)->targetList;
List *elist;
sublink->oper = NIL;

5
src/backend/utils/sort/psort.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.35 1998/01/31 04:39:13 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.36 1998/02/01 22:20:47 momjian Exp $
*
* NOTES
* Sorts the first relation into the second relation.
@ -1090,7 +1090,7 @@ static int
_psort_cmp (HeapTuple *ltup, HeapTuple *rtup)
{
register Datum lattr, rattr;
int nkey = 0;
int nkey;
int result = 0;
bool isnull1, isnull2;
@ -1119,7 +1119,6 @@ _psort_cmp (HeapTuple *ltup, HeapTuple *rtup)
}
else if (!(result = -(long) (*fmgr_faddr(&PsortKeys[nkey].sk_func)) (lattr, rattr)))
result = (long) (*fmgr_faddr(&PsortKeys[nkey].sk_func)) (rattr, lattr);
nkey++;
}
return (result);
}