diff options
| author | Bruce Momjian <bruce@momjian.us> | 1997-12-22 05:42:25 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1997-12-22 05:42:25 +0000 |
| commit | d404f1006bdc65e09a7c8e6230bc8e3d1008a297 (patch) | |
| tree | f6491e4242a07b9d2df9b36d2bfd3ede713460e0 /src/backend/optimizer/path/xfunc.c | |
| parent | 78a055a6593efb8e64ad2edac2c86b680c177ad2 (diff) | |
Fix for select 1=1 or 2=2, select 1=1 and 2=2, and select sum(2+2).
Diffstat (limited to 'src/backend/optimizer/path/xfunc.c')
| -rw-r--r-- | src/backend/optimizer/path/xfunc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/optimizer/path/xfunc.c b/src/backend/optimizer/path/xfunc.c index c0213df36ac..08f0b13cec8 100644 --- a/src/backend/optimizer/path/xfunc.c +++ b/src/backend/optimizer/path/xfunc.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.8 1997/12/11 17:36:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/xfunc.c,v 1.9 1997/12/22 05:41:59 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -451,7 +451,7 @@ xfunc_local_expense(LispValue clause) (LispValue) get_funcargs(clause))); else if (fast_not_clause(clause)) return (xfunc_local_expense(lsecond(clause))); - else if (fast_or_clause(clause)) + else if (fast_or_clause(clause) || fast_and_clause(clause)) { /* find cost of evaluating each disjunct */ for (tmpclause = lnext(clause); tmpclause != LispNil; @@ -845,7 +845,7 @@ xfunc_find_references(LispValue clause) } else if (fast_not_clause(clause)) return (xfunc_find_references(lsecond(clause))); - else if (fast_or_clause(clause)) + else if (fast_or_clause(clause) || fast_and_clause(clause)) { /* string together result of all operands of OR */ for (tmpclause = lnext(clause); tmpclause != LispNil; @@ -1186,7 +1186,7 @@ xfunc_fixvars(LispValue clause, /* clause being pulled up */ xfunc_fixvars(lfirst(tmpclause), rel, varno); else if (fast_not_clause(clause)) xfunc_fixvars(lsecond(clause), rel, varno); - else if (fast_or_clause(clause)) + else if (fast_or_clause(clause) || fast_and_clause(clause)) for (tmpclause = lnext(clause); tmpclause != LispNil; tmpclause = lnext(tmpclause)) xfunc_fixvars(lfirst(tmpclause), rel, varno); |