From f67a931aa42a28b44c12bed603365686101cfa0e Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 13 Jun 2002 15:10:25 +0000
Subject: [PATCH] Make WHERE conditions pulled up from subqueries be executed
 before outer WHERE conditions, if there is no reason to do it differently.

---
 src/backend/optimizer/plan/planner.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index a28c088e8f..7e1c7ffdc0 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.119 2002/05/18 18:49:41 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.120 2002/06/13 15:10:25 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -656,7 +656,7 @@ preprocess_jointree(Query *parse, Node *jtnode)
 				if (childlen <= 1 || (childlen + myothers) <= geqo_rels / 2)
 				{
 					newlist = nconc(newlist, subf->fromlist);
-					f->quals = make_and_qual(f->quals, subf->quals);
+					f->quals = make_and_qual(subf->quals, f->quals);
 				}
 				else
 					newlist = lappend(newlist, child);