Commit79f99a3

committed

Fix for psort. fixes regression tests.

1 parenta654db3 commit79f99a3Copy full SHA for 79f99a3

File tree

-6

lines changed

-6

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.13 1998/02/0119:43:37 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.14 1998/02/0122:20:39 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -252,14 +252,14 @@ transformExpr(ParseState pstate, Node expr, int precedence)`
`252`	`252`	`lfirst(llist)=transformExpr(pstate,lfirst(llist),precedence);`
`253`	`253`
`254`	`254`	`if (length(sublink->lefthand)!=`
`255`		`-length(sublink->subselect->targetList))`
	`255`	`+length(((Query*)sublink->subselect)->targetList))`
`256`	`256`	`elog(ERROR,"Subselect has too many or too few fields.");`
`257`	`257`
`258`	`258`	`if (sublink->subLinkType!=EXISTS_SUBLINK)`
`259`	`259`	`{`
`260`	`260`	`char*op=lfirst(sublink->oper);`
`261`	`261`	`List*left_expr=sublink->lefthand;`
`262`		`-List*right_expr=sublink->subselect->targetList;`
	`262`	`+Listright_expr=((Query)sublink->subselect)->targetList;`
`263`	`263`	`List*elist;`
`264`	`264`
`265`	`265`	`sublink->oper=NIL;`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.35 1998/01/31 04:39:13 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.36 1998/02/01 22:20:47 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`*Sorts the first relation into the second relation.`
`@@ -1090,7 +1090,7 @@ static int`
`1090`	`1090`	`_psort_cmp (HeapTupleltup,HeapTuplertup)`
`1091`	`1091`	`{`
`1092`	`1092`	`registerDatumlattr,rattr;`
`1093`		`-intnkey=0;`
	`1093`	`+intnkey;`
`1094`	`1094`	`intresult=0;`
`1095`	`1095`	`boolisnull1,isnull2;`
`1096`	`1096`
`@@ -1119,7 +1119,6 @@ _psort_cmp (HeapTuple ltup, HeapTuple rtup)`
`1119`	`1119`	`}`
`1120`	`1120`	`elseif (!(result=-(long) (*fmgr_faddr(&PsortKeys[nkey].sk_func)) (lattr,rattr)))`
`1121`	`1121`	`result= (long) (*fmgr_faddr(&PsortKeys[nkey].sk_func)) (rattr,lattr);`
`1122`		`-nkey++;`
`1123`	`1122`	`}`
`1124`	`1123`	`return (result);`
`1125`	`1124`	`}`

Comments

(0)