diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-03-30 16:47:35 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-03-30 16:47:35 +0000 |
| commit | 9a0dd4fb183958f59f68d8a5f096dd8df18d9b59 (patch) | |
| tree | 2843356dbd25f4e11cf4a414e56d6afae3775071 /src/backend/executor/nodeSeqscan.c | |
| parent | c579ce0fb03aaf92d184adf369cf13be013adf1b (diff) | |
| download | postgresql-9a0dd4fb183958f59f68d8a5f096dd8df18d9b59.tar.gz postgresql-9a0dd4fb183958f59f68d8a5f096dd8df18d9b59.zip | |
There's a patch attached to fix gcc 2.8.x warnings, except for the
yyerror ones from bison. It also includes a few 'enhancements' to
the C programming style (which are, of course, personal).
The other patch removes the compilation of backend/lib/qsort.c, as
qsort() is a standard function in stdlib.h and can be used any
where else (and it is). It was only used in
backend/optimizer/geqo/geqo_pool.c, backend/optimizer/path/predmig.c,
and backend/storage/page/bufpage.c
> > Some or all of these changes might not be appropriate for v6.3,
since we > > are in beta testing and since they do not affect the
current functionality. > > For those cases, how about submitting
patches based on the final v6.3 > > release?
There's more to come. Please review these patches. I ran the
regression tests and they only failed where this was expected
(random, geo, etc).
Cheers,
Jeroen
Diffstat (limited to 'src/backend/executor/nodeSeqscan.c')
| -rw-r--r-- | src/backend/executor/nodeSeqscan.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index fd8485daa38..a351ea4a298 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.8 1997/11/20 23:21:34 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.9 1998/03/30 16:46:15 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -128,8 +128,7 @@ ExecSeqScan(SeqScan *node) * else, scan the relation * ---------------- */ - outerPlan = outerPlan((Plan *) node); - if (outerPlan) + if ((outerPlan = outerPlan((Plan *) node)) != NULL) { slot = ExecProcNode(outerPlan, (Plan *) node); } @@ -375,8 +374,7 @@ ExecSeqReScan(SeqScan *node, ExprContext *exprCtxt, Plan *parent) scanstate = node->scanstate; estate = node->plan.state; - outerPlan = outerPlan((Plan *) node); - if (outerPlan) + if ((outerPlan = outerPlan((Plan *) node)) != NULL) { /* we are scanning a subplan */ outerPlan = outerPlan((Plan *) node); |