aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/optimizer/path/allpaths.c7
-rw-r--r--src/backend/optimizer/path/prune.c3
2 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 506bab263a0..d27b31cfbd7 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.9 1997/06/05 09:33:50 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.10 1997/06/10 07:55:45 vadim Exp $
*
*-------------------------------------------------------------------------
*/
@@ -216,9 +216,8 @@ find_join_paths(Query *root, List *outer_rels, int levels_left)
foreach(x, new_rels) {
rel = (Rel*)lfirst(x);
-#if 0 /* compute_joinrel_size already called by prune_rel_paths */
- rel->size = compute_rel_size(rel);
-#endif
+ if ( rel->size <= 0 )
+ rel->size = compute_rel_size(rel);
rel->width = compute_rel_width(rel);
/*#define OPTIMIZER_DEBUG*/
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index 6f8a28c958b..0b154e108fa 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.2 1996/11/08 05:57:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.3 1997/06/10 07:55:47 vadim Exp $
*
*-------------------------------------------------------------------------
*/
@@ -101,6 +101,7 @@ prune_rel_paths(List *rel_list)
foreach(x, rel_list) {
rel = (Rel*)lfirst(x);
+ rel->size = 0;
foreach(y, rel->pathlist) {
path = (Path*)lfirst(y);