Commit8f29241

committed

Back-patch LIMIT + INTERSECT fix into 6.5.*.

1 parenta9ba771 commit8f29241Copy full SHA for 8f29241

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.88.2.3 1999/09/24 15:08:59 thomas Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.88.2.4 1999/10/19 04:38:07 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`* HISTORY`
`16`	`16`	`* AUTHORDATEMAJOR EVENT`
`@@ -2768,6 +2768,8 @@ SelectStmt: select_clause sort_clause for_update_clause opt_select_limit`
`2768`	`2768`	`/* finally attach the sort clause */`
`2769`	`2769`	`first_select->sortClause = $2;`
`2770`	`2770`	`first_select->forUpdate = $3;`
	`2771`	`+ first_select->limitOffset = nth(0, $4);`
	`2772`	`+ first_select->limitCount = nth(1, $4);`
`2771`	`2773`	`$$ = (Node *)first_select;`
`2772`	`2774`	`}`
`2773`	`2775`	`if (((SelectStmt *)$$)->forUpdate != NULL && QueryIsRule)`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.48 1999/07/11 17:54:30 tgl Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.48.2.1 1999/10/19 04:38:05 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -2859,6 +2859,8 @@ Except_Intersect_Rewrite(Query *parsetree)`
`2859`	`2859`	`boolisBinary,`
`2860`	`2860`	`isPortal,`
`2861`	`2861`	`isTemp;`
	`2862`	`+Node*limitOffset,`
	`2863`	`+*limitCount;`
`2862`	`2864`	`CmdTypecommandType=CMD_SELECT;`
`2863`	`2865`	`List*rtable_insert=NIL;`
`2864`	`2866`
`@@ -2909,6 +2911,8 @@ Except_Intersect_Rewrite(Query *parsetree)`
`2909`	`2911`	`isBinary=parsetree->isBinary;`
`2910`	`2912`	`isPortal=parsetree->isPortal;`
`2911`	`2913`	`isTemp=parsetree->isTemp;`
	`2914`	`+limitOffset=parsetree->limitOffset;`
	`2915`	`+limitCount=parsetree->limitCount;`
`2912`	`2916`
`2913`	`2917`	`/*`
`2914`	`2918`	`* The operator tree attached to parsetree->intersectClause is still`
`@@ -3094,6 +3098,8 @@ Except_Intersect_Rewrite(Query *parsetree)`
`3094`	`3098`	`result->isPortal=isPortal;`
`3095`	`3099`	`result->isBinary=isBinary;`
`3096`	`3100`	`result->isTemp=isTemp;`
	`3101`	`+result->limitOffset=limitOffset;`
	`3102`	`+result->limitCount=limitCount;`
`3097`	`3103`
`3098`	`3104`	`/*`
`3099`	`3105`	`* The relation to insert into is attached to the range table of the`

Comments

(0)